build.sh and docs update

This reverts commit 47c115e699.

README.md

@@ -2,6 +2,12 @@
 
 Toxygen is powerful cross-platform [Tox](https://tox.chat/) client written in pure Python3.
 
+[![Release](https://img.shields.io/github/release/toxygen-project/toxygen.svg?style=flat)](https://github.com/toxygen-project/toxygen/releases/latest)
+[![Stars](https://img.shields.io/github/stars/toxygen-project/toxygen.svg?style=flat)](https://github.com/toxygen-project/toxygen/stargazers)
+[![Open issues](https://img.shields.io/github/issues/toxygen-project/toxygen.svg?style=flat)](https://github.com/toxygen-project/toxygen/issues)
+[![License](https://img.shields.io/badge/license-GPLv3-blue.svg?style=flat)](https://raw.githubusercontent.com/toxygen-project/toxygen/master/LICENSE.md)
+[![Build Status](https://travis-ci.org/toxygen-project/toxygen.svg?branch=master)](https://travis-ci.org/toxygen-project/toxygen)
+
 ### [Install](/docs/install.md) - [Contribute](/docs/contributing.md) - [Plugins](/docs/plugins.md) - [Compile](/docs/compile.md) - [Contact](/docs/contact.md) - [Updater](https://github.com/toxygen-project/toxygen_updater)
 
 ### Supported OS: Linux and Windows
@@ -38,12 +44,21 @@ Toxygen is powerful cross-platform [Tox](https://tox.chat/) client written in pu
 - File resuming
 - Read receipts
 
+### Downloads
+[Releases](https://github.com/toxygen-project/toxygen/releases)
+
+[Download last stable version](https://github.com/toxygen-project/toxygen/archive/master.zip)
+
+[Download develop version](https://github.com/toxygen-project/toxygen/archive/develop.zip)
+
 ### Screenshots
 *Toxygen on Ubuntu and Windows*
 ![Ubuntu](/docs/ubuntu.png)
 ![Windows](/docs/windows.png)
 
-## Forked
+### Docs
+[Check /docs/ for more info](/docs/)
 
-This hard-forked from https://github.com/toxygen-project/toxygen
-```next_gen``` branch.
+Also visit [pythonhosted.org/Toxygen/](http://pythonhosted.org/Toxygen/)
+
+[Wiki](https://wiki.tox.chat/clients/toxygen)

docs/contact.md

@@ -1,6 +1,5 @@
 # Contact us:
 
-1) https://git.plastiras.org/emdee/toxygen/issues
+1) Using GitHub - open issue
 
-2) Use Toxygen Tox Group (NGC) - 
-ID: 59D68B2709E81A679CF91416CB0E3692851C6CFCABEFF98B7131E3805A6D75FA
+2) Use Toxygen Tox Group (NGC) - ID: 59D68B2709E81A679CF91416CB0E3692851C6CFCABEFF98B7131E3805A6D75FA

docs/contributing.md

@@ -7,15 +7,12 @@ Help us find all bugs in Toxygen! Please provide following info:
 - Toxygen executable info - python executable (.py), precompiled binary, from package etc.
 - Steps to reproduce the bug
 
-Want to see new feature in Toxygen? 
-[Ask for it!](https://git.plastiras.org/emdee/toxygen/issues)
+Want to see new feature in Toxygen? [Ask for it!](https://github.com/toxygen-project/toxygen/issues)
 
 # Pull requests
 
 Developer? Feel free to open pull request. Our dev team is small so we glad to get help.
-Don't know what to do? Improve UI, fix 
-[issues](https://git.plastiras.org/emdee/toxygen/issues) 
-or implement features from our TODO list.
+Don't know what to do? Improve UI, fix [issues](https://github.com/toxygen-project/toxygen/issues) or implement features from our TODO list.
 You can find our TODO's in code, issues list and [here](/README.md). Also you can implement [plugins](/docs/plugins.md) for Toxygen.
 
 Note that we have a lot of branches for different purposes. Master branch is for stable versions (releases) only, so I recommend to open PR's to develop branch. Development of next Toxygen version usually goes there. Other branches used for implementing different tasks such as file transfers improvements or audio calls implementation etc.

docs/install.md

@@ -1,15 +1,33 @@
 # How to install Toxygen
 
+## Use precompiled binary (recommended for users):
+[Check our releases page](https://github.com/toxygen-project/toxygen/releases)
+
+## Using pip3
+
+### Windows
+
+``pip install toxygen``
+
+Run app using ``toxygen`` command.
+
 ### Linux
 
-1. Install [c-toxcore](https://github.com/TokTok/c-toxcore/)
+1. Install [toxcore](https://github.com/irungentoo/toxcore/blob/master/INSTALL.md) with toxav support in your system (install in /usr/lib/)
 2. Install PortAudio: 
 ``sudo apt-get install portaudio19-dev``
 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) or via ``sudo pip3 install opencv-python``
-5. Install [toxygen](https://git.plastiras.org/emdee/toxygen/)
+5. Install toxygen: 
+``sudo pip3 install toxygen``
 6. Run toxygen using ``toxygen`` command.
 
+## Packages
+
+Arch Linux: [AUR](https://aur.archlinux.org/packages/toxygen-git/)
+
+Debian/Ubuntu: [tox.chat](https://tox.chat/download.html#gnulinux)
+
 ## From source code (recommended for developers)
 
 ### Windows
@@ -26,17 +44,27 @@ Note: 32-bit Python isn't supported due to bug with videocalls. It is strictly r
 8. Download latest libtox.dll build, download latest libsodium.a build, put it into \toxygen\libs\
 9. Run \toxygen\main.py.
 
+Optional: install toxygen using setup.py: ``python setup.py install``
+
+[libtox.dll for 32-bit Python](https://build.tox.chat/view/libtoxcore/job/libtoxcore_build_windows_x86_shared_release/lastSuccessfulBuild/artifact/libtoxcore_build_windows_x86_shared_release.zip)
+
+[libtox.dll for 64-bit Python](https://build.tox.chat/view/libtoxcore/job/libtoxcore_build_windows_x86-64_shared_release/lastSuccessfulBuild/artifact/libtoxcore_build_windows_x86-64_shared_release.zip)
+
+[libsodium.a for 32-bit Python](https://build.tox.chat/view/libsodium/job/libsodium_build_windows_x86_static_release/lastSuccessfulBuild/artifact/libsodium_build_windows_x86_static_release.zip)
+
+[libsodium.a for 64-bit Python](https://build.tox.chat/view/libsodium/job/libsodium_build_windows_x86-64_static_release/lastSuccessfulBuild/artifact/libsodium_build_windows_x86-64_static_release.zip)
+
 ### Linux
 
 1. Install latest Python3: 
 ``sudo apt-get install python3``
 2. Install PyQt5: ``sudo apt-get install python3-pyqt5`` or ``sudo pip3 install pyqt5``
-3. Install [toxcore](https://github.com/TokTok/c-toxcore) with toxav support)
+3. Install [toxcore](https://github.com/irungentoo/toxcore/blob/master/INSTALL.md) with toxav support in your system (install in /usr/lib/)
 4. Install PyAudio: 
 ``sudo apt-get install portaudio19-dev`` and ``sudo apt-get install python3-pyaudio`` (or ``sudo pip3 install pyaudio``)
 5. Install NumPy: ``sudo pip3 install numpy``
 6. Install [OpenCV](http://docs.opencv.org/trunk/d7/d9f/tutorial_linux_install.html) or via ``sudo pip3 install opencv-python``
-7. [Download toxygen](https://git.plastiras.org/emdee/toxygen/)
+7. [Download toxygen](https://github.com/toxygen-project/toxygen/archive/master.zip)
 8. Unpack archive
 9. Run app:
 ``python3 main.py``

docs/plugin_api.md

@@ -1,6 +1,6 @@
 # Plugins API
 
-In Toxygen plugin is single python module (.py file) and directory with data associated with it. 
+In Toxygen plugin is single python (supported Python 3.4 - 3.6) module (.py file) and directory with data associated with it. 
 Every module must contain one class derived from PluginSuperClass defined in [plugin_super_class.py](/src/plugins/plugin_super_class.py). Instance of this class will be created by PluginLoader class (defined in [plugin_support.py](/src/plugin_support.py) ). This class can enable/disable plugins and send data to it. 
 
 Every plugin has its own full name and unique short name (1-5 symbols). Main app can get it using special methods. 

setup.py

@@ -12,9 +12,9 @@ version = main.__version__ + '.0'
 
 
 if system() == 'Windows':
-    MODULES = ['PyQt5', 'PyAudio', 'numpy', 'opencv-python', 'pydenticon', 'cv2']
+    MODULES = ['PyQt5', 'PyAudio', 'numpy', 'opencv-python', 'pydenticon']
 else:
-    MODULES = ['pydenticon']
+    MODULES = []
     try:
         import pyaudio
     except ImportError:
@@ -32,9 +32,9 @@ else:
     except ImportError:
         MODULES.append('opencv-python')
     try:
-        import coloredlogs
+        import pydenticon
     except ImportError:
-        MODULES.append('coloredlogs')
+        MODULES.append('pydenticon')
 
 
 def get_packages():
@@ -84,9 +84,6 @@ setup(name='Toxygen',
           'Programming Language :: Python :: 3 :: Only',
           'Programming Language :: Python :: 3.5',
           'Programming Language :: Python :: 3.6',
-          'Programming Language :: Python :: 3.7',
-          'Programming Language :: Python :: 3.8',
-          'Programming Language :: Python :: 3.9',
       ],
       entry_points={
           'console_scripts': ['toxygen=toxygen.main:main']

toxygen/av/calls.py

@@ -1,26 +1,14 @@
-# -*- mode: python; indent-tabs-mode: nil; py-indent-offset: 4; coding: utf-8 -*-
 import pyaudio
 import time
 import threading
-import itertools
-
 from wrapper.toxav_enums import *
+import cv2
+import itertools
+import numpy as np
 from av import screen_sharing
 from av.call import Call
 import common.tox_save
 
-from utils import ui as util_ui
-import tests.support_testing as ts
-from middleware.threads import invoke_in_main_thread
-from main import sleep
-from middleware.threads import BaseThread
-
-global LOG
-import logging
-LOG = logging.getLogger('app.'+__name__)
-
-TIMER_TIMEOUT = 30.0
-bSTREAM_CALLBACK = False
 
 class AV(common.tox_save.ToxAvSave):
 
@@ -28,13 +16,6 @@ class AV(common.tox_save.ToxAvSave):
         super().__init__(toxav)
         self._settings = settings
         self._running = True
-        s = settings
-        if 'video' not in s:
-            LOG.warn("AV.__init__ 'video' not in s" )
-            LOG.debug(f"AV.__init__ {s!r}" )
-        elif 'device' not in s['video']:
-            LOG.warn("AV.__init__ 'device' not in s.video" )
-            LOG.debug(f"AV.__init__ {s['video']!r}" )
 
         self._calls = {}  # dict: key - friend number, value - Call instance
 
@@ -44,27 +25,17 @@ class AV(common.tox_save.ToxAvSave):
         self._audio_running = False
         self._out_stream = None
 
+        self._audio_rate = 8000
         self._audio_channels = 1
         self._audio_duration = 60
-        self._audio_rate_pa = 48000
-        self._audio_rate_tox = 48000
-        self._audio_rate_pa = 48000
-        self._audio_krate_tox_audio = self._audio_rate_tox // 1000
-        self._audio_krate_tox_video = 5000
-        self._audio_sample_count_pa = self._audio_rate_pa * self._audio_channels * self._audio_duration // 1000
-        self._audio_sample_count_tox = self._audio_rate_tox * self._audio_channels * self._audio_duration // 1000
+        self._audio_sample_count = self._audio_rate * self._audio_channels * self._audio_duration // 1000
 
         self._video = None
         self._video_thread = None
         self._video_running = False
 
-        self._video_width = 320
-        self._video_height = 240
-
-        iOutput = self._settings._args.audio['output']
-        self.lPaSampleratesO = ts.lSdSamplerates(iOutput)
-        global oPYA
-        oPYA = self._audio = pyaudio.PyAudio()
+        self._video_width = 640
+        self._video_height = 480
 
     def stop(self):
         self._running = False
@@ -80,70 +51,27 @@ class AV(common.tox_save.ToxAvSave):
 
     def __call__(self, friend_number, audio, video):
         """Call friend with specified number"""
-        if friend_number in self._calls:
-            LOG.warn(f"__call__ already has {friend_number}")
-            return
-        if self._audio_krate_tox_audio not in ts.lToxSampleratesK:
-            LOG.warn(f"__call__ {self._audio_krate_tox_audio} not in {ts.lToxSampleratesK}")
-
-        try:
-            self._toxav.call(friend_number,
-                             self._audio_krate_tox_audio if audio else 0,
-                             self._audio_krate_tox_video if video else 0)
-        except ArgumentError as e:
-            LOG.warn(f"_toxav.call already has {friend_number}")
-            return
+        self._toxav.call(friend_number, 32 if audio else 0, 5000 if video else 0)
         self._calls[friend_number] = Call(audio, video)
-        threading.Timer(TIMER_TIMEOUT,
-                        lambda: self.finish_not_started_call(friend_number)).start()
+        threading.Timer(30.0, lambda: self.finish_not_started_call(friend_number)).start()
 
     def accept_call(self, friend_number, audio_enabled, video_enabled):
-        # obsolete
-        return call_accept_call(self, friend_number, audio_enabled, video_enabled)
-    
-    def call_accept_call(self, friend_number, audio_enabled, video_enabled):
-        LOG.debug(f"call_accept_call from {friend_number} {self._running}" +
-                  f"{audio_enabled} {video_enabled}")
-        # import pdb; pdb.set_trace() - gets into q Qt exec_ problem
-        # ts.trepan_handler()
-
-        if self._audio_krate_tox_audio not in ts.lToxSampleratesK:
-            LOG.warn(f"__call__ {self._audio_krate_tox_audio} not in {ts.lToxSampleratesK}")
         if self._running:
             self._calls[friend_number] = Call(audio_enabled, video_enabled)
-            # audio_bit_rate: Audio bit rate in Kb/sec. Set this to 0 to disable audio sending.
-            # video_bit_rate: Video bit rate in Kb/sec. Set this to 0 to disable video sending.
-            try:
-                self._toxav.answer(friend_number,
-                                   self._audio_krate_tox_audio if audio_enabled else 0,
-                                   self._audio_krate_tox_video if video_enabled else 0)
-            except ArgumentError as e:
-                LOG.debug(f"AV accept_call error from {friend_number} {self._running}" +
-                          f"{e}")
-                raise
+            self._toxav.answer(friend_number, 32 if audio_enabled else 0, 5000 if video_enabled else 0)
             if audio_enabled:
-                # may raise
                 self.start_audio_thread()
             if video_enabled:
-                # may raise
                 self.start_video_thread()
 
     def finish_call(self, friend_number, by_friend=False):
-        LOG.debug(f"finish_call  {friend_number}")
         if not by_friend:
             self._toxav.call_control(friend_number, TOXAV_CALL_CONTROL['CANCEL'])
         if friend_number in self._calls:
             del self._calls[friend_number]
-        try:
-            # AttributeError: 'int' object has no attribute 'out_audio'
-            if not len(list(filter(lambda c: c.out_audio, self._calls))):
-                self.stop_audio_thread()
-            if not len(list(filter(lambda c: c.out_video, self._calls))):
-                self.stop_video_thread()
-        except Exception as e:
-            LOG.error(f"finish_call FixMe:   {e}")
-            # dunno
+        if not len(list(filter(lambda c: c.out_audio, self._calls))):
             self.stop_audio_thread()
+        if not len(list(filter(lambda c: c.out_video, self._calls))):
             self.stop_video_thread()
 
     def finish_not_started_call(self, friend_number):
@@ -156,7 +84,6 @@ class AV(common.tox_save.ToxAvSave):
         """
         New call state
         """
-        LOG.debug(f"toxav_call_state_cb {friend_number}")
         call = self._calls[friend_number]
         call.is_active = True
 
@@ -180,80 +107,31 @@ class AV(common.tox_save.ToxAvSave):
         """
         Start audio sending
         """
-        global oPYA
-        iInput = self._settings._args.audio['input']
         if self._audio_thread is not None:
-            LOG.warn(f"start_audio_thread device={iInput}")
             return
-        iInput = self._settings._args.audio['input']
-        LOG.debug(f"start_audio_thread device={iInput}")
-        lPaSamplerates = ts.lSdSamplerates(iInput)
-        if not(len(lPaSamplerates)):
-            e = f"No supported sample rates for device: audio[input]={iInput!r}"
-            LOG.error(f"No supported sample rates {e}")
-            raise RuntimeError(e)
-        if not self._audio_rate_pa in lPaSamplerates:
-            LOG.warn(f"{self._audio_rate_pa} not in {lPaSamplerates!r}")
-            if False:
-                self._audio_rate_pa = oPYA.get_device_info_by_index(iInput)['defaultSampleRate']
-            else:
-                LOG.warn(f"Setting audio_rate to: {lPaSamplerates[0]}")
-                self._audio_rate_pa = lPaSamplerates[0]
 
-        try:
-            LOG.debug( f"start_audio_thread framerate: {self._audio_rate_pa}" \
-                     +f" device: {iInput}"
-                     +f" supported: {lPaSamplerates!r}")
-            if self._audio_rate_pa not in lPaSamplerates:
-                LOG.warn(f"PAudio sampling rate was {self._audio_rate_pa} changed to {lPaSamplerates[0]}")
-                self._audio_rate_pa = lPaSamplerates[0]
+        self._audio_running = True
 
-            if bSTREAM_CALLBACK:
-                self._audio_stream = oPYA.open(format=pyaudio.paInt16,
-                                               rate=self._audio_rate_pa,
-                                               channels=self._audio_channels,
-                                               input=True,
-                                               input_device_index=iInput,
-                                               frames_per_buffer=self._audio_sample_count_pa * 10,
-                                               stream_callback=self.send_audio_data)
-                self._audio_running = True
-                self._audio_stream.start_stream()
-                while self._audio_stream.is_active():
-                    sleep(0.1)
-                self._audio_stream.stop_stream()
-                self._audio_stream.close()
+        self._audio = pyaudio.PyAudio()
+        self._audio_stream = self._audio.open(format=pyaudio.paInt16,
+                                              rate=self._audio_rate,
+                                              channels=self._audio_channels,
+                                              input=True,
+                                              input_device_index=self._settings.audio['input'],
+                                              frames_per_buffer=self._audio_sample_count * 10)
 
-            else:
-                self._audio_stream = oPYA.open(format=pyaudio.paInt16,
-                                               rate=self._audio_rate_pa,
-                                               channels=self._audio_channels,
-                                               input=True,
-                                               input_device_index=iInput,
-                                               frames_per_buffer=self._audio_sample_count_pa * 10)
-                self._audio_running = True
-                self._audio_thread = BaseThread(target=self.send_audio,
-                                                      name='_audio_thread')
-                self._audio_thread.start()
-
-        except Exception as e:
-            LOG.error(f"Starting self._audio.open {e}")
-            LOG.debug(repr(dict(format=pyaudio.paInt16,
-                                rate=self._audio_rate_pa,
-                                channels=self._audio_channels,
-                                input=True,
-                                input_device_index=iInput,
-                                frames_per_buffer=self._audio_sample_count_pa * 10)))
-            # catcher in place in calls_manager
-            raise RuntimeError(e)
-        else:
-            LOG.debug(f"start_audio_thread {self._audio_stream!r}")
+        self._audio_thread = threading.Thread(target=self.send_audio)
+        self._audio_thread.start()
 
     def stop_audio_thread(self):
 
         if self._audio_thread is None:
             return
+
         self._audio_running = False
 
+        self._audio_thread.join()
+
         self._audio_thread = None
         self._audio_stream = None
         self._audio = None
@@ -266,39 +144,21 @@ class AV(common.tox_save.ToxAvSave):
     def start_video_thread(self):
         if self._video_thread is not None:
             return
-        s = self._settings
-        if 'video' not in s:
-            LOG.warn("AV.__init__ 'video' not in s" )
-            LOG.debug(f"start_video_thread {s!r}" )
-            raise RuntimeError("start_video_thread not 'video' in s)" )
-        elif 'device' not in s['video']:
-            LOG.error("start_video_thread not 'device' in s['video']" )
-            LOG.debug(f"start_video_thread {s['video']!r}" )
-            raise RuntimeError("start_video_thread not 'device' ins s['video']" )
-        self._video_width = s['video']['width']
-        self._video_height = s['video']['height']
-
-        LOG.info("start_video_thread " \
-                     +f" device: {s['video']['device']}" \
-                     +f" supported: {s['video']['width']} {s['video']['height']}")
-
-        s['video']['device'] = -1
-        if s['video']['device'] == -1:
-            self._video = screen_sharing.DesktopGrabber(s['video']['x'],
-                                                        s['video']['y'],
-                                                        s['video']['width'],
-                                                        s['video']['height'])
-        else:
-            with ts.ignoreStdout():
-                import cv2
-                self._video = cv2.VideoCapture(s['video']['device'])
-                self._video.set(cv2.CAP_PROP_FPS, 25)
-                self._video.set(cv2.CAP_PROP_FRAME_WIDTH, self._video_width)
-                self._video.set(cv2.CAP_PROP_FRAME_HEIGHT, self._video_height)
 
         self._video_running = True
-        self._video_thread = BaseThread(target=self.send_video,
-                                        name='_video_thread')
+        self._video_width = s.video['width']
+        self._video_height = s.video['height']
+
+        if s.video['device'] == -1:
+            self._video = screen_sharing.DesktopGrabber(self._settings.video['x'], self._settings.video['y'],
+                                                        self._settings.video['width'], self._settings.video['height'])
+        else:
+            self._video = cv2.VideoCapture(self._settings.video['device'])
+            self._video.set(cv2.CAP_PROP_FPS, 25)
+            self._video.set(cv2.CAP_PROP_FRAME_WIDTH, self._video_width)
+            self._video.set(cv2.CAP_PROP_FRAME_HEIGHT, self._video_height)
+
+        self._video_thread = threading.Thread(target=self.send_video)
         self._video_thread.start()
 
     def stop_video_thread(self):
@@ -306,17 +166,7 @@ class AV(common.tox_save.ToxAvSave):
             return
 
         self._video_running = False
-        i = 0
-        while i < ts.iTHREAD_JOINS:
-            self._video_thread.join(ts.iTHREAD_TIMEOUT)
-            try:
-                if not self._video_thread.is_alive(): break
-            except:
-                # AttributeError: 'NoneType' object has no attribute 'join'
-                break
-            i = i + 1
-        else:
-            LOG.warn("self._video_thread.is_alive BLOCKED")
+        self._video_thread.join()
         self._video_thread = None
         self._video = None
 
@@ -330,109 +180,58 @@ class AV(common.tox_save.ToxAvSave):
         """
 
         if self._out_stream is None:
-            iOutput = self._settings._args.audio['output']
-            if not rate in self.lPaSampleratesO:
-                LOG.warn(f"{rate} not in {self.lPaSampleratesO!r}")
-                if False:
-                    rate = oPYA.get_device_info_by_index(iOutput)['defaultSampleRate']
-                LOG.warn(f"Setting audio_rate to: {self.lPaSampleratesO[0]}")
-                rate = self.lPaSampleratesO[0]
-            try:
-                with ts.ignoreStderr():
-                    self._out_stream = oPYA.open(format=pyaudio.paInt16,
-                                                 channels=channels_count,
-                                                 rate=rate,
-                                                 output_device_index=iOutput,
-                                                 output=True)
-            except Exception as e:
-               LOG.error(f"Error playing audio_chunk creating self._out_stream   {e}")
-               LOG.debug(f"audio_chunk output_device_index={self._settings._args.audio['input']} rate={rate} channels={channels_count}")
-               invoke_in_main_thread(util_ui.message_box,
-                                    str(e),
-                                    util_ui.tr("Error Chunking audio"))
-               # dunno
-               self.stop()
-               return
-
+            self._out_stream = self._audio.open(format=pyaudio.paInt16,
+                                                channels=channels_count,
+                                                rate=rate,
+                                                output_device_index=self._settings.audio['output'],
+                                                output=True)
         self._out_stream.write(samples)
 
     # -----------------------------------------------------------------------------------------------------------------
     # AV sending
     # -----------------------------------------------------------------------------------------------------------------
 
-    def send_audio_data(self, data, count, *largs, **kwargs):
-        pcm = data
-        # :param sampling_rate: Audio sampling rate used in this frame.
-        if self._toxav is None:
-            raise RuntimeError("_toxav not initialized")
-        if self._audio_rate_tox not in ts.lToxSamplerates:
-            LOG.warn(f"ToxAudio sampling rate was {self._audio_rate_tox} changed to {ts.lToxSamplerates[0]}")
-            self._audio_rate_tox = ts.lToxSamplerates[0]
-
-        for friend_num in self._calls:
-            if self._calls[friend_num].out_audio:
-                try:
-                    # app.av.calls ERROR Error send_audio:   One of the frame parameters was invalid. E.g. the resolution may be too small or too large, or the audio sampling rate may be unsupported
-                    self._toxav.audio_send_frame(friend_num,
-                                                 pcm,
-                                                 count,
-                                                 self._audio_channels,
-                                                 self._audio_rate_tox)
-                except Exception as e:
-                   LOG.error(f"Error send_audio audio_send_frame: {e}")
-                   LOG.debug(f"send_audio self._audio_rate_tox={self._audio_rate_tox} self._audio_channels={self._audio_channels}")
-                   invoke_in_main_thread(util_ui.message_box,
-                                    str(e),
-                                    util_ui.tr("Error send_audio audio_send_frame"))
-                   pass
-
     def send_audio(self):
         """
         This method sends audio to friends
         """
-        i=0
-        count = self._audio_sample_count_tox
-        LOG.debug(f"send_audio stream={self._audio_stream}")
+
         while self._audio_running:
             try:
-                pcm = self._audio_stream.read(count, exception_on_overflow=False)
-                if not pcm:
-                    sleep(0.1)
-                else:
-                    self.send_audio_data(pcm, count)
+                pcm = self._audio_stream.read(self._audio_sample_count)
+                if pcm:
+                    for friend_num in self._calls:
+                        if self._calls[friend_num].out_audio:
+                            try:
+                                self._toxav.audio_send_frame(friend_num, pcm, self._audio_sample_count,
+                                                             self._audio_channels, self._audio_rate)
+                            except:
+                                pass
             except:
                 pass
-            i += 1
-            LOG.debug(f"send_audio {i}")
-            sleep(0.01)
+
+            time.sleep(0.01)
 
     def send_video(self):
         """
         This method sends video to friends
         """
-        LOG.debug(f"send_video thread={threading.current_thread()}"
-                  +f" self._video_running={self._video_running}"
-                  +f" device: {self._settings['video']['device']}" )
         while self._video_running:
             try:
                 result, frame = self._video.read()
                 if result:
-                    LOG.warn(f"send_video video_send_frame _video.read")
-                else:
                     height, width, channels = frame.shape
                     for friend_num in self._calls:
                         if self._calls[friend_num].out_video:
                             try:
                                 y, u, v = self.convert_bgr_to_yuv(frame)
                                 self._toxav.video_send_frame(friend_num, width, height, y, u, v)
-                            except Exception as e:
-                                LOG.debug(f"send_video video_send_frame ERROR {e}")
+                            except:
                                 pass
-
             except:
                 pass
 
-            sleep(0.1)
+            time.sleep(0.01)
 
     def convert_bgr_to_yuv(self, frame):
         """
@@ -465,14 +264,11 @@ class AV(common.tox_save.ToxAvSave):
         Y, U, V can be extracted using slices and joined in one list using itertools.chain.from_iterable()
         Function returns bytes(y), bytes(u), bytes(v), because it is required for ctypes
         """
-        with ts.ignoreStdout():
-            import cv2
         frame = cv2.cvtColor(frame, cv2.COLOR_BGR2YUV_I420)
 
         y = frame[:self._video_height, :]
         y = list(itertools.chain.from_iterable(y))
 
-        import numpy as np
         u = np.zeros((self._video_height // 2, self._video_width // 2), dtype=np.int)
         u[::2, :] = frame[self._video_height:self._video_height * 5 // 4, :self._video_width // 2]
         u[1::2, :] = frame[self._video_height:self._video_height * 5 // 4, self._video_width // 2:]

toxygen/av/calls_manager.py

@@ -1,30 +1,22 @@
-# -*- mode: python; indent-tabs-mode: nil; py-indent-offset: 4; coding: utf-8 -*-
-
-import sys
 import threading
-
+import cv2
 import av.calls
 from messenger.messages import *
 from ui import av_widgets
 import common.event as event
-import utils.ui as util_ui
 
-global LOG
-import logging
-LOG = logging.getLogger('app.'+__name__)
 
 class CallsManager:
 
-    def __init__(self, toxav, settings, main_screen, contacts_manager, app=None):
+    def __init__(self, toxav, settings, screen, contacts_manager):
         self._call = av.calls.AV(toxav, settings)  # object with data about calls
         self._call_widgets = {}  # dict of incoming call widgets
         self._incoming_calls = set()
         self._settings = settings
-        self._main_screen = main_screen
+        self._screen = screen
         self._contacts_manager = contacts_manager
         self._call_started_event = event.Event()  # friend_number, audio, video, is_outgoing
         self._call_finished_event = event.Event()  # friend_number, is_declined
-        self._app = app
 
     def set_toxav(self, toxav):
         self._call.set_toxav(toxav)
@@ -53,10 +45,10 @@ class CallsManager:
         if not self._contacts_manager.is_active_a_friend():
             return
         if num not in self._call and self._contacts_manager.is_active_online():  # start call
-            if not self._settings['audio']['enabled']:
+            if not self._settings.audio['enabled']:
                 return
             self._call(num, audio, video)
-            self._main_screen.active_call()
+            self._screen.active_call()
             self._call_started_event(num, audio, video, True)
         elif num in self._call:  # finish or cancel call if you call with active friend
             self.stop_call(num, False)
@@ -65,13 +57,13 @@ class CallsManager:
         """
         Incoming call from friend.
         """
-        LOG.debug(__name__ +f" incoming_call  {friend_number}")
-        # if not self._settings['audio']['enabled']: return
+        if not self._settings.audio['enabled']:
+            return
         friend = self._contacts_manager.get_friend_by_number(friend_number)
         self._call_started_event(friend_number, audio, video, False)
         self._incoming_calls.add(friend_number)
         if friend_number == self._contacts_manager.get_active_number():
-            self._main_screen.incoming_call()
+            self._screen.incoming_call()
         else:
             friend.actions = True
         text = util_ui.tr("Incoming video call") if video else util_ui.tr("Incoming audio call")
@@ -82,73 +74,31 @@ class CallsManager:
     def accept_call(self, friend_number, audio, video):
         """
         Accept incoming call with audio or video
-        Called from a thread
         """
-
-        LOG.debug(f"CM accept_call from {friend_number} {audio} {video}")
-        sys.stdout.flush()
-
-        try:
-            self._call.call_accept_call(friend_number, audio, video)
-        except Exception as e:
-            LOG.error(f"accept_call _call.accept_call ERROR for {friend_number} {e}")
-            self._main_screen.call_finished()
-            if hasattr(self._main_screen, '_settings') and \
-              'audio' in self._main_screen._settings and \
-              'input' in self._main_screen._settings['audio']:
-                iInput = self._settings['audio']['input']
-                iOutput = self._settings['audio']['output']
-                iVideo = self._settings['video']['device']
-                LOG.debug(f"iInput={iInput} iOutput={iOutput} iVideo={iVideo}")
-            elif hasattr(self._main_screen, '_settings') and \
-              hasattr(self._main_screen._settings, 'audio') and \
-              'input' not in self._main_screen._settings['audio']:
-                LOG.warn(f"'audio' not in {self._main_screen._settings!r}")
-            elif hasattr(self._main_screen, '_settings') and \
-              hasattr(self._main_screen._settings, 'audio') and \
-              'input' not in self._main_screen._settings['audio']:
-                LOG.warn(f"'audio' not in {self._main_screen._settings!r}")
-            else:
-                LOG.warn(f"_settings not in self._main_screen")
-            util_ui.message_box(str(e),
-                            util_ui.tr('ERROR Accepting call from {friend_number}'))
-        else:
-            self._main_screen.active_call()
-            
-        finally:
-            # does not terminate call - just the av_widget
-            if friend_number in self._incoming_calls:
-                self._incoming_calls.remove(friend_number)
-            try:
-                self._call_widgets[friend_number].close()
-                del self._call_widgets[friend_number]
-            except:
-                # RuntimeError: wrapped C/C++ object of type IncomingCallWidget has been deleted
-
-                pass
-            LOG.debug(f" closed self._call_widgets[{friend_number}]")
+        self._call.accept_call(friend_number, audio, video)
+        self._screen.active_call()
+        if friend_number in self._incoming_calls:
+            self._incoming_calls.remove(friend_number)
+        del self._call_widgets[friend_number]
 
     def stop_call(self, friend_number, by_friend):
         """
         Stop call with friend
         """
-        LOG.debug(__name__+f" stop_call {friend_number}")
         if friend_number in self._incoming_calls:
             self._incoming_calls.remove(friend_number)
             is_declined = True
         else:
             is_declined = False
-        self._main_screen.call_finished()
+        self._screen.call_finished()
+        is_video = self._call.is_video_call(friend_number)
         self._call.finish_call(friend_number, by_friend)  # finish or decline call
         if friend_number in self._call_widgets:
             self._call_widgets[friend_number].close()
             del self._call_widgets[friend_number]
 
         def destroy_window():
-            #??? FixMed
-            is_video = self._call.is_video_call(friend_number)
             if is_video:
-                import cv2
                 cv2.destroyWindow(str(friend_number))
 
         threading.Timer(2.0, destroy_window).start()

toxygen/av/screen_sharing.py

@@ -1,3 +1,4 @@
+import numpy as np
 from PyQt5 import QtWidgets
 
 
@@ -16,7 +17,6 @@ class DesktopGrabber:
         pixmap = self._screen.grabWindow(0, self._x, self._y, self._width, self._height)
         image = pixmap.toImage()
         s = image.bits().asstring(self._width * self._height * 4)
-        import numpy as np
         arr = np.fromstring(s, dtype=np.uint8).reshape((self._height, self._width, 4))
 
         return True, arr

toxygen/bootstrap/bootstrap.py

@@ -1,49 +1,83 @@
-# -*- mode: python; indent-tabs-mode: nil; py-indent-offset: 4; coding: utf-8 -*-
 import random
 import urllib.request
 from utils.util import *
-from PyQt5 import QtNetwork
-from PyQt5 import QtCore
-try:
-    import requests
-except ImportError:
-    requests = None
-try:
-    import pycurl
-    import certifi
-    from io import BytesIO
-except ImportError:
-    pycurl = None
+from PyQt5 import QtNetwork, QtCore
+import json
 
-from user_data.settings import get_user_config_path
-from tests.support_testing import download_url, _get_nodes_path
 
-global LOG
-import logging
-LOG = logging.getLogger('app.'+'bootstrap')
+DEFAULT_NODES_COUNT = 4
 
-def download_nodes_list(settings, oArgs):
+
+class Node:
+
+    def __init__(self, node):
+        self._ip, self._port, self._tox_key = node['ipv4'], node['port'], node['public_key']
+        self._priority = random.randint(1, 1000000) if node['status_tcp'] and node['status_udp'] else 0
+
+    def get_priority(self):
+        return self._priority
+
+    priority = property(get_priority)
+
+    def get_data(self):
+        return self._ip, self._port, self._tox_key
+
+
+def generate_nodes(nodes_count=DEFAULT_NODES_COUNT):
+    with open(_get_nodes_path(), 'rt') as fl:
+        json_nodes = json.loads(fl.read())['nodes']
+    nodes = map(lambda json_node: Node(json_node), json_nodes)
+    nodes = filter(lambda n: n.priority > 0, nodes)
+    sorted_nodes = sorted(nodes, key=lambda x: x.priority)
+    if nodes_count is not None:
+        sorted_nodes = sorted_nodes[-DEFAULT_NODES_COUNT:]
+    for node in sorted_nodes:
+        yield node.get_data()
+
+
+def download_nodes_list(settings):
+    url = 'https://nodes.tox.chat/json'
     if not settings['download_nodes_list']:
-        return ''
-    url = settings['download_nodes_url']
-    path = _get_nodes_path(oArgs=oArgs)
-    # dont download blindly so we can edit the file and not block on startup
-    if os.path.isfile(path):
-        with open(path, 'rt') as fl:
-            result = fl.read()
-            return result
-    LOG.debug("downloading list of nodes")
-    result = download_url(url, settings._app)
-    if not result:
-        LOG.warn("failed downloading list of nodes")
-        return ''
-    LOG.info("downloaded list of nodes")
-    _save_nodes(result, settings._app)
-    return result
+        return
 
-def _save_nodes(nodes, app):
+    if not settings['proxy_type']:  # no proxy
+        try:
+            req = urllib.request.Request(url)
+            req.add_header('Content-Type', 'application/json')
+            response = urllib.request.urlopen(req)
+            result = response.read()
+            _save_nodes(result)
+        except Exception as ex:
+            log('TOX nodes loading error: ' + str(ex))
+    else:  # proxy
+        netman = QtNetwork.QNetworkAccessManager()
+        proxy = QtNetwork.QNetworkProxy()
+        proxy.setType(
+            QtNetwork.QNetworkProxy.Socks5Proxy if settings['proxy_type'] == 2 else QtNetwork.QNetworkProxy.HttpProxy)
+        proxy.setHostName(settings['proxy_host'])
+        proxy.setPort(settings['proxy_port'])
+        netman.setProxy(proxy)
+        try:
+            request = QtNetwork.QNetworkRequest()
+            request.setUrl(QtCore.QUrl(url))
+            reply = netman.get(request)
+
+            while not reply.isFinished():
+                QtCore.QThread.msleep(1)
+                QtCore.QCoreApplication.processEvents()
+            data = bytes(reply.readAll().data())
+            _save_nodes(data)
+        except Exception as ex:
+            log('TOX nodes loading error: ' + str(ex))
+
+
+def _get_nodes_path():
+    return join_path(curr_directory(__file__), 'nodes.json')
+
+
+def _save_nodes(nodes):
     if not nodes:
         return
-    with open(_get_nodes_path(oArgs=app._args), 'wb') as fl:
-        LOG.info("Saving nodes to " +_get_nodes_path())
+    print('Saving nodes...')
+    with open(_get_nodes_path(), 'wb') as fl:
         fl.write(nodes)

toxygen/contacts/basecontact.py

@@ -1,4 +1,3 @@
-# -*- mode: python; indent-tabs-mode: nil; py-indent-offset: 4; coding: utf-8 -*-
 from user_data.settings import *
 from PyQt5 import QtCore, QtGui
 from wrapper.toxcore_enums_and_consts import TOX_PUBLIC_KEY_SIZE

toxygen/contacts/contact.py

@@ -1,17 +1,10 @@
-# -*- mode: python; indent-tabs-mode: nil; py-indent-offset: 4; coding: utf-8 -*-
-from history.database import TIMEOUT, \
-    SAVE_MESSAGES, MESSAGE_AUTHOR
-
+from history.database import *
 from contacts import basecontact, common
 from messenger.messages import *
 from contacts.contact_menu import *
 from file_transfers import file_transfers as ft
 import re
 
-# LOG=util.log
-global LOG
-import logging
-LOG = logging.getLogger('app.'+__name__)
 
 class Contact(basecontact.BaseContact):
     """
@@ -146,7 +139,7 @@ class Contact(basecontact.BaseContact):
                                             and m.tox_message_id == tox_message_id, self._corr))[0]
             message.mark_as_sent()
         except Exception as ex:
-            LOG.error(f"Mark as sent:  {ex!s}")
+            util.log('Mark as sent ex: ' + str(ex))
 
     # -----------------------------------------------------------------------------------------------------------------
     # Message deletion

toxygen/contacts/contact_menu.py

@@ -1,12 +1,6 @@
-# -*- mode: python; indent-tabs-mode: nil; py-indent-offset: 4; coding: utf-8 -*-
 from PyQt5 import QtWidgets
-
 import utils.ui as util_ui
-from wrapper.toxcore_enums_and_consts import *
 
-global LOG
-import logging
-LOG = logging.getLogger('app')
 
 # -----------------------------------------------------------------------------------------------------------------
 # Builder
@@ -105,8 +99,8 @@ class BaseContactMenuGenerator:
         (copy_menu_builder
          .with_name(util_ui.tr('Copy'))
          .with_action(util_ui.tr('Name'), lambda: main_screen.copy_text(self._contact.name))
-         .with_action(util_ui.tr("Status message"), lambda: main_screen.copy_text(self._contact.status_message))
-         .with_action(util_ui.tr("Public key"), lambda: main_screen.copy_text(self._contact.tox_id))
+         .with_action(util_ui.tr('Status message'), lambda: main_screen.copy_text(self._contact.status_message))
+         .with_action(util_ui.tr('Public key'), lambda: main_screen.copy_text(self._contact.tox_id))
          )
 
         return copy_menu_builder
@@ -114,11 +108,11 @@ class BaseContactMenuGenerator:
     def _generate_history_menu_builder(self, history_loader, main_screen):
         history_menu_builder = ContactMenuBuilder()
         (history_menu_builder
-         .with_name(util_ui.tr("Chat history"))
-         .with_action(util_ui.tr("Clear history"), lambda: history_loader.clear_history(self._contact)
+         .with_name(util_ui.tr('Chat history'))
+         .with_action(util_ui.tr('Clear history'), lambda: history_loader.clear_history(self._contact)
                                                            or main_screen.messages.clear())
-         .with_action(util_ui.tr("Export as text"), lambda: history_loader.export_history(self._contact))
-         .with_action(util_ui.tr("Export as HTML"), lambda: history_loader.export_history(self._contact, False))
+         .with_action(util_ui.tr('Export as text'), lambda: history_loader.export_history(self._contact))
+         .with_action(util_ui.tr('Export as HTML'), lambda: history_loader.export_history(self._contact, False))
          )
 
         return history_menu_builder
@@ -133,16 +127,16 @@ class FriendMenuGenerator(BaseContactMenuGenerator):
         groups_menu_builder = self._generate_groups_menu(contacts_manager, groups_service)
 
         allowed = self._contact.tox_id in settings['auto_accept_from_friends']
-        auto = util_ui.tr("Disallow auto accept") if allowed else util_ui.tr('Allow auto accept')
+        auto = util_ui.tr('Disallow auto accept') if allowed else util_ui.tr('Allow auto accept')
 
         builder = ContactMenuBuilder()
         menu = (builder
-                .with_action(util_ui.tr("Set alias"), lambda: main_screen.set_alias(number))
+                .with_action(util_ui.tr('Set alias'), lambda: main_screen.set_alias(number))
                 .with_submenu(history_menu_builder)
                 .with_submenu(copy_menu_builder)
                 .with_action(auto, lambda: main_screen.auto_accept(number, not allowed))
-                .with_action(util_ui.tr("Remove friend"), lambda: main_screen.remove_friend(number))
-                .with_action(util_ui.tr("Block friend"), lambda: main_screen.block_friend(number))
+                .with_action(util_ui.tr('Remove friend'), lambda: main_screen.remove_friend(number))
+                .with_action(util_ui.tr('Block friend'), lambda: main_screen.block_friend(number))
                 .with_action(util_ui.tr('Notes'), lambda: main_screen.show_note(self._contact))
                 .with_optional_submenu(plugins_menu_builder)
                 .with_optional_submenu(groups_menu_builder)
@@ -171,13 +165,11 @@ class FriendMenuGenerator(BaseContactMenuGenerator):
 
     def _generate_groups_menu(self, contacts_manager, groups_service):
         chats = contacts_manager.get_group_chats()
-        LOG.debug(f"_generate_groups_menu len(chats)={len(chats)} or self._contact.status={self._contact.status}")
         if not len(chats) or self._contact.status is None:
-            #? return None
-            pass
+            return None
         groups_menu_builder = ContactMenuBuilder()
         (groups_menu_builder
-         .with_name(util_ui.tr("Invite to group"))
+         .with_name(util_ui.tr('Invite to group'))
          .with_actions([(g.name, lambda: groups_service.invite_friend(self._contact.number, g.number)) for g in chats])
          )
 
@@ -192,26 +184,26 @@ class GroupMenuGenerator(BaseContactMenuGenerator):
 
         builder = ContactMenuBuilder()
         menu = (builder
-                .with_action(util_ui.tr("Set alias"), lambda: main_screen.set_alias(number))
+                .with_action(util_ui.tr('Set alias'), lambda: main_screen.set_alias(number))
                 .with_submenu(copy_menu_builder)
                 .with_submenu(history_menu_builder)
-                .with_optional_action(util_ui.tr("Manage group"),
+                .with_optional_action(util_ui.tr('Manage group'),
                                       lambda: groups_service.show_group_management_screen(self._contact),
                                       self._contact.is_self_founder())
-                .with_optional_action(util_ui.tr("Group settings"),
+                .with_optional_action(util_ui.tr('Group settings'),
                                       lambda: groups_service.show_group_settings_screen(self._contact),
                                       not self._contact.is_self_founder())
-                .with_optional_action(util_ui.tr("Set topic"),
+                .with_optional_action(util_ui.tr('Set topic'),
                                       lambda: groups_service.set_group_topic(self._contact),
                                       self._contact.is_self_moderator_or_founder())
-#                .with_action(util_ui.tr("Bans list"),
-#                             lambda: groups_service.show_bans_list(self._contact))
-                .with_action(util_ui.tr("Reconnect to group"),
+                .with_action(util_ui.tr('Bans list'),
+                             lambda: groups_service.show_bans_list(self._contact))
+                .with_action(util_ui.tr('Reconnect to group'),
                              lambda: groups_service.reconnect_to_group(self._contact.number))
-                .with_optional_action(util_ui.tr("Disconnect from group"),
+                .with_optional_action(util_ui.tr('Disconnect from group'),
                                       lambda: groups_service.disconnect_from_group(self._contact.number),
                                       self._contact.status is not None)
-                .with_action(util_ui.tr("Leave group"), lambda: groups_service.leave_group(self._contact.number))
+                .with_action(util_ui.tr('Leave group'), lambda: groups_service.leave_group(self._contact.number))
                 .with_action(util_ui.tr('Notes'), lambda: main_screen.show_note(self._contact))
                 ).build()
 
@@ -226,10 +218,10 @@ class GroupPeerMenuGenerator(BaseContactMenuGenerator):
 
         builder = ContactMenuBuilder()
         menu = (builder
-                .with_action(util_ui.tr("Set alias"), lambda: main_screen.set_alias(number))
+                .with_action(util_ui.tr('Set alias'), lambda: main_screen.set_alias(number))
                 .with_submenu(copy_menu_builder)
                 .with_submenu(history_menu_builder)
-                .with_action(util_ui.tr("Quit chat"),
+                .with_action(util_ui.tr('Quit chat'),
                              lambda: contacts_manager.remove_group_peer(self._contact))
                 .with_action(util_ui.tr('Notes'), lambda: main_screen.show_note(self._contact))
                 ).build()

toxygen/contacts/contact_provider.py

@@ -15,10 +15,8 @@ class ContactProvider(tox_save.ToxSave):
     # -----------------------------------------------------------------------------------------------------------------
 
     def get_friend_by_number(self, friend_number):
-        try:
-            public_key = self._tox.friend_get_public_key(friend_number)
-        except Exception as e:
-            return None
+        public_key = self._tox.friend_get_public_key(friend_number)
+
         return self.get_friend_by_public_key(public_key)
 
     def get_friend_by_public_key(self, public_key):
@@ -31,10 +29,7 @@ class ContactProvider(tox_save.ToxSave):
         return friend
 
     def get_all_friends(self):
-        try:
-            friend_numbers = self._tox.self_get_friend_list()
-        except Exception as e:
-            return None
+        friend_numbers = self._tox.self_get_friend_list()
         friends = map(lambda n: self.get_friend_by_number(n), friend_numbers)
 
         return list(friends)
@@ -44,19 +39,13 @@ class ContactProvider(tox_save.ToxSave):
     # -----------------------------------------------------------------------------------------------------------------
 
     def get_all_groups(self):
-        try:
-            group_numbers = range(self._tox.group_get_number_groups())
-        except Exception as e:
-            return None
+        group_numbers = range(self._tox.group_get_number_groups())
         groups = map(lambda n: self.get_group_by_number(n), group_numbers)
 
         return list(groups)
 
     def get_group_by_number(self, group_number):
-        try:
-            public_key = self._tox.group_get_chat_id(group_number)
-        except Exception as e:
-            return None
+        public_key = self._tox.group_get_chat_id(group_number)
 
         return self.get_group_by_public_key(public_key)
 
@@ -78,8 +67,8 @@ class ContactProvider(tox_save.ToxSave):
 
     def get_group_peer_by_id(self, group, peer_id):
         peer = group.get_peer_by_id(peer_id)
-        if peer:
-            return self._get_group_peer(group, peer)
+
+        return self._get_group_peer(group, peer)
 
     def get_group_peer_by_public_key(self, group, public_key):
         peer = group.get_peer_by_public_key(public_key)

toxygen/contacts/contacts_manager.py

@@ -1,15 +1,9 @@
-# -*- mode: python; indent-tabs-mode: nil; py-indent-offset: 4; coding: utf-8 -*-
 from contacts.friend import Friend
 from contacts.group_chat import GroupChat
 from messenger.messages import *
 from common.tox_save import ToxSave
 from contacts.group_peer_contact import GroupPeerContact
 
-# LOG=util.log
-global LOG
-import logging
-LOG = logging.getLogger('app.'+__name__)
-log = lambda x: LOG.info(x)
 
 class ContactsManager(ToxSave):
     """
@@ -135,8 +129,8 @@ class ContactsManager(ToxSave):
             self._set_current_contact_data(contact)
             self._active_contact_changed(contact)
         except Exception as ex:  # no friend found. ignore
-            LOG.warn(f"no friend found. Friend value:  {value!s}")
-            LOG.error('in set active: ' + str(ex))
+            util.log('Friend value: ' + str(value))
+            util.log('Error in set active: ' + str(ex))
             raise
 
     active_contact = property(get_active, set_active)
@@ -241,9 +235,8 @@ class ContactsManager(ToxSave):
     def get_or_create_group_peer_contact(self, group_number, peer_id):
         group = self.get_group_by_number(group_number)
         peer = group.get_peer_by_id(peer_id)
-        if peer: # broken
-            if not self.check_if_contact_exists(peer.public_key):
-                self.add_group_peer(group, peer)
+        if not self.check_if_contact_exists(peer.public_key):
+            self.add_group_peer(group, peer)
 
         return self.get_contact_by_tox_id(peer.public_key)
 
@@ -382,18 +375,16 @@ class ContactsManager(ToxSave):
 
     def remove_group_peer_by_id(self, group, peer_id):
         peer = group.get_peer_by_id(peer_id)
-        if peer: # broken
-            if not self.check_if_contact_exists(peer.public_key):
-                return
-            contact = self.get_contact_by_tox_id(peer.public_key)
-            self.remove_group_peer(contact)
+        if not self.check_if_contact_exists(peer.public_key):
+            return
+        contact = self.get_contact_by_tox_id(peer.public_key)
+        self.remove_group_peer(contact)
 
     def remove_group_peer(self, group_peer_contact):
         contact = self.get_contact_by_tox_id(group_peer_contact.tox_id)
-        if contact:
-            self._cleanup_contact_data(contact)
-            num = self._contacts.index(contact)
-            self._delete_contact(num)
+        self._cleanup_contact_data(contact)
+        num = self._contacts.index(contact)
+        self._delete_contact(num)
 
     def get_gc_peer_name(self, name):
         group = self.get_curr_contact()
@@ -441,7 +432,7 @@ class ContactsManager(ToxSave):
             self.save_profile()
             return True
         except Exception as ex:  # wrong data
-            LOG.error('Friend request failed with ' + str(ex))
+            util.log('Friend request failed with ' + str(ex))
             return str(ex)
 
     def process_friend_request(self, tox_id, message):
@@ -460,7 +451,7 @@ class ContactsManager(ToxSave):
                 data = self._tox.get_savedata()
                 self._profile_manager.save_profile(data)
         except Exception as ex:  # something is wrong
-            LOG.error('Accept friend request failed! ' + str(ex))
+            util.log('Accept friend request failed! ' + str(ex))
 
     def can_send_typing_notification(self):
         return self._settings['typing_notifications'] and not self.is_active_a_group_chat_peer()

toxygen/contacts/group_chat.py

@@ -1,5 +1,3 @@
-# -*- mode: python; indent-tabs-mode: nil; py-indent-offset: 4; coding: utf-8 -*-
-
 from contacts import contact
 from contacts.contact_menu import GroupMenuGenerator
 import utils.util as util
@@ -8,14 +6,6 @@ from wrapper import toxcore_enums_and_consts as constants
 from common.tox_save import ToxSave
 from groups.group_ban import GroupBan
 
-global LOG
-import logging
-LOG = logging.getLogger(__name__)
-def LOG_ERROR(l): print('ERROR_: '+l)
-def LOG_WARN(l): print('WARN_: '+l)
-def LOG_INFO(l): print('INFO_: '+l)
-def LOG_DEBUG(l): print('DEBUG_: '+l)
-def LOG_TRACE(l): pass # print('TRACE+ '+l)
 
 class GroupChat(contact.Contact, ToxSave):
 
@@ -83,10 +73,6 @@ class GroupChat(contact.Contact, ToxSave):
         return self.get_self_role() == constants.TOX_GROUP_ROLE['FOUNDER']
 
     def add_peer(self, peer_id, is_current_user=False):
-        if peer_id >  self._peers_limit:
-            LOG_WARN(f"add_peer id={peer_id} > {self._peers_limit}")
-            return
-        
         peer = GroupChatPeer(peer_id,
                              self._tox.group_peer_get_name(self._number, peer_id),
                              self._tox.group_peer_get_status(self._number, peer_id),
@@ -100,41 +86,25 @@ class GroupChat(contact.Contact, ToxSave):
             self.remove_all_peers_except_self()
         else:
             peer = self.get_peer_by_id(peer_id)
-            if peer: # broken
-                self._peers.remove(peer)
-            else:
-                LOG_WARN(f"remove_peer empty peers for {peer_id}")
+            self._peers.remove(peer)
 
     def get_peer_by_id(self, peer_id):
         peers = list(filter(lambda p: p.id == peer_id, self._peers))
-        if peers:
-            #? broken
-            return peers[0]
-        else:
-            LOG_WARN(f"get_peer_by_id empty peers for {peer_id}")
-            return []
+
+        return peers[0]
 
     def get_peer_by_public_key(self, public_key):
         peers = list(filter(lambda p: p.public_key == public_key, self._peers))
-        # DEBUGc: group_moderation #0 mod_id=4294967295 event_type=3
-        # WARN_: get_peer_by_id empty peers for 4294967295
-        if peers:
-            return peers[0]
-        else:
-            LOG_WARN(f"get_peer_by_public_key empty peers for {public_key}")
-            return []
+
+        return peers[0]
 
     def remove_all_peers_except_self(self):
         self._peers = self._peers[:1]
 
     def get_peers_names(self):
         peers_names = map(lambda p: p.name, self._peers)
-        if peers_names: # broken
-            return list(peers_names)
-        else:
-            LOG_WARN(f"get_peers_names empty peers")
-            #? broken
-            return []
+
+        return list(peers_names)
 
     def get_peers(self):
         return self._peers[:]
@@ -142,17 +112,16 @@ class GroupChat(contact.Contact, ToxSave):
     peers = property(get_peers)
 
     def get_bans(self):
-        return []
-#        ban_ids = self._tox.group_ban_get_list(self._number)
-#        bans = []
-#        for ban_id in ban_ids:
-#            ban = GroupBan(ban_id,
-#                           self._tox.group_ban_get_target(self._number, ban_id),
-#                           self._tox.group_ban_get_time_set(self._number, ban_id))
-#            bans.append(ban)
-#
-#        return bans
-#
+        ban_ids = self._tox.group_ban_get_list(self._number)
+        bans = []
+        for ban_id in ban_ids:
+            ban = GroupBan(ban_id,
+                           self._tox.group_ban_get_target(self._number, ban_id),
+                           self._tox.group_ban_get_time_set(self._number, ban_id))
+            bans.append(ban)
+
+        return bans
+
     bans = property(get_bans)
 
     # -----------------------------------------------------------------------------------------------------------------

toxygen/contacts/profile.py

@@ -1,13 +1,9 @@
-# -*- mode: python; indent-tabs-mode: nil; py-indent-offset: 4; coding: utf-8 -*-
 from contacts import basecontact
 import random
 import threading
 import common.tox_save as tox_save
 from middleware.threads import invoke_in_main_thread
 
-global LOG
-import logging
-LOG = logging.getLogger('app.'+__name__)
 
 class Profile(basecontact.BaseContact, tox_save.ToxSave):
     """
@@ -18,7 +14,6 @@ class Profile(basecontact.BaseContact, tox_save.ToxSave):
         :param tox: tox instance
         :param screen: ref to main screen
         """
-        assert tox
         basecontact.BaseContact.__init__(self,
                                          profile_manager,
                                          tox.self_get_name(),

toxygen/file_transfers/file_transfers_handler.py

@@ -1,19 +1,11 @@
-# -*- mode: python; indent-tabs-mode: nil; py-indent-offset: 4; coding: utf-8 -*-
 from messenger.messages import *
 from ui.contact_items import *
 import utils.util as util
 from common.tox_save import ToxSave
-from tests.support_testing import assert_main_thread
-from copy import deepcopy
 
-# LOG=util.log
-global LOG
-import logging
-LOG = logging.getLogger('app.'+__name__)
-log = lambda x: LOG.info(x)
 
 class FileTransfersHandler(ToxSave):
-    lBlockAvatars = []
+
     def __init__(self, tox, settings, contact_provider, file_transfers_message_service, profile):
         super().__init__(tox)
         self._settings = settings
@@ -27,7 +19,6 @@ class FileTransfersHandler(ToxSave):
         # key = (friend number, file number), value - message id
 
         profile.avatar_changed_event.add_callback(self._send_avatar_to_contacts)
-        self. lBlockAvatars = []
         
     def stop(self):
         self._settings['paused_file_transfers'] = self._paused_file_transfers if self._settings['resend_files'] else {}
@@ -46,7 +37,6 @@ class FileTransfersHandler(ToxSave):
         :param file_name: file name without path
         """
         friend = self._get_friend_by_number(friend_number)
-        if friend is None: return None
         auto = self._settings['allow_auto_accept'] and friend.tox_id in self._settings['auto_accept_from_friends']
         inline = is_inline(file_name) and self._settings['allow_inline']
         file_id = self._tox.file_get_file_id(friend_number, file_number)
@@ -95,9 +85,7 @@ class FileTransfersHandler(ToxSave):
             self._tox.file_control(friend_number, file_number, TOX_FILE_CONTROL['CANCEL'])
 
     def cancel_not_started_transfer(self, friend_number, message_id):
-        friend = self._get_friend_by_number(friend_number)
-        if friend is None: return None
-        friend.delete_one_unsent_file(message_id)
+        self._get_friend_by_number(friend_number).delete_one_unsent_file(message_id)
 
     def pause_transfer(self, friend_number, file_number, by_friend=False):
         """
@@ -127,7 +115,6 @@ class FileTransfersHandler(ToxSave):
         """
         path = self._generate_valid_path(path, from_position)
         friend = self._get_friend_by_number(friend_number)
-        if friend is None: return None
         if not inline:
             rt = ReceiveTransfer(path, self._tox, friend_number, size, file_number, from_position)
         else:
@@ -158,7 +145,6 @@ class FileTransfersHandler(ToxSave):
 
     def send_inline(self, data, file_name, friend_number, is_resend=False):
         friend = self._get_friend_by_number(friend_number)
-        if friend is None: return None
         if friend.status is None and not is_resend:
             self._file_transfers_message_service.add_unsent_file_message(friend, file_name, data)
             return
@@ -176,12 +162,11 @@ class FileTransfersHandler(ToxSave):
         :param file_id: file id of transfer
         """
         friend = self._get_friend_by_number(friend_number)
-        if friend is None: return None
         if friend.status is None and not is_resend:
             self._file_transfers_message_service.add_unsent_file_message(friend, path, None)
             return
         elif friend.status is None and is_resend:
-            LOG.error('Error in sending')
+            print('Error in sending')
             return
         st = SendTransfer(path, self._tox, friend_number, TOX_FILE_KIND['DATA'], file_id)
         file_name = os.path.basename(path)
@@ -201,27 +186,23 @@ class FileTransfersHandler(ToxSave):
 
     def transfer_finished(self, friend_number, file_number):
         transfer = self._file_transfers[(friend_number, file_number)]
-        friend = self._get_friend_by_number(friend_number)
-        if friend is None: return None
         t = type(transfer)
         if t is ReceiveAvatar:
-            friend.load_avatar()
+            self._get_friend_by_number(friend_number).load_avatar()
         elif t is ReceiveToBuffer or (t is SendFromBuffer and self._settings['allow_inline']):  # inline image
-            LOG.debug('inline')
+            print('inline')
             inline = InlineImageMessage(transfer.data)
             message_id = self._insert_inline_before[(friend_number, file_number)]
             del self._insert_inline_before[(friend_number, file_number)]
-            if friend is None: return None
-            index = friend.insert_inline(message_id, inline)
+            index = self._get_friend_by_number(friend_number).insert_inline(message_id, inline)
             self._file_transfers_message_service.add_inline_message(transfer, index)
         del self._file_transfers[(friend_number, file_number)]
 
     def send_files(self, friend_number):
+        friend = self._get_friend_by_number(friend_number)
+        friend.remove_invalid_unsent_files()
+        files = friend.get_unsent_files()
         try:
-            friend = self._get_friend_by_number(friend_number)
-            if friend is None: return None
-            friend.remove_invalid_unsent_files()
-            files = friend.get_unsent_files()
             for fl in files:
                 data, path = fl.data, fl.path
                 if data is not None:
@@ -230,7 +211,6 @@ class FileTransfersHandler(ToxSave):
                     self.send_file(path, friend_number, True)
             friend.clear_unsent_files()
             for key in self._paused_file_transfers.keys():
-                # RuntimeError: dictionary changed size during iteration
                 (path, ft_friend_number, is_incoming, start_position) = self._paused_file_transfers[key]
                 if not os.path.exists(path):
                     del self._paused_file_transfers[key]
@@ -238,16 +218,12 @@ class FileTransfersHandler(ToxSave):
                     self.send_file(path, friend_number, True, key)
                     del self._paused_file_transfers[key]
         except Exception as ex:
-            LOG.error('Exception in file sending: ' + str(ex))
+            print('Exception in file sending: ' + str(ex))
 
     def friend_exit(self, friend_number):
-        # RuntimeError: dictionary changed size during iteration
-        lMayChangeDynamically = self._file_transfers.copy()
-        for friend_num, file_num in lMayChangeDynamically:
+        for friend_num, file_num in self._file_transfers.keys():
             if friend_num != friend_number:
                 continue
-            if (friend_num, file_num) not in self._file_transfers:
-                continue
             ft = self._file_transfers[(friend_num, file_num)]
             if type(ft) is SendTransfer:
                 self._paused_file_transfers[ft.file_id] = [ft.path, friend_num, False, -1]
@@ -264,16 +240,8 @@ class FileTransfersHandler(ToxSave):
         :param friend_number: number of friend who should get new avatar
         :param avatar_path: path to avatar or None if reset
         """
-        if (avatar_path, friend_number,) in self.lBlockAvatars:
-            return
-
-        try:
-            sa = SendAvatar(avatar_path, self._tox, friend_number)
-            self._file_transfers[(friend_number, sa.file_number)] = sa
-        except Exception as e:
-            # ArgumentError('This client is currently not connected to the friend.')
-            LOG.error(f"send_avatar {e}")
-            self.lBlockAvatars.append( (avatar_path, friend_number,) )
+        sa = SendAvatar(avatar_path, self._tox, friend_number)
+        self._file_transfers[(friend_number, sa.file_number)] = sa
 
     def incoming_avatar(self, friend_number, file_number, size):
         """
@@ -283,7 +251,6 @@ class FileTransfersHandler(ToxSave):
         :param size: size of avatar or 0 (default avatar)
         """
         friend = self._get_friend_by_number(friend_number)
-        if friend is None: return None
         ra = ReceiveAvatar(friend.get_contact_avatar_path(), self._tox, friend_number, size, file_number)
         if ra.state != FILE_TRANSFER_STATE['CANCELLED']:
             self._file_transfers[(friend_number, file_number)] = ra
@@ -292,7 +259,6 @@ class FileTransfersHandler(ToxSave):
             friend.reset_avatar(self._settings['identicons'])
 
     def _send_avatar_to_contacts(self, _):
-        # from a callback
         friends = self._get_all_friends()
         for friend in filter(self._is_friend_online, friends):
             self.send_avatar(friend.number)
@@ -303,7 +269,6 @@ class FileTransfersHandler(ToxSave):
 
     def _is_friend_online(self, friend_number):
         friend = self._get_friend_by_number(friend_number)
-        if friend is None: return None
 
         return friend.status is not None
 

toxygen/groups/groups_service.py

@@ -1,11 +1,8 @@
-# -*- mode: python; indent-tabs-mode: nil; py-indent-offset: 4; coding: utf-8 -*-
-
 import common.tox_save as tox_save
 import utils.ui as util_ui
 from groups.peers_list import PeersListGenerator
 from groups.group_invite import GroupInvite
 import wrapper.toxcore_enums_and_consts as constants
-from wrapper.toxcore_enums_and_consts import *
 
 
 class GroupsService(tox_save.ToxSave):
@@ -68,17 +65,7 @@ class GroupsService(tox_save.ToxSave):
     # -----------------------------------------------------------------------------------------------------------------
 
     def invite_friend(self, friend_number, group_number):
-        if self._tox.friend_get_connection_status(friend_number) == TOX_CONNECTION['NONE']:
-            title = f"Error in group_invite_friend {friend_number}"
-            e = f"Friend not connected friend_number={friend_number}"
-            util_ui.message_box(title +'\n' +str(e), title)
-            return
-        
-        try:
-            self._tox.group_invite_friend(group_number, friend_number)
-        except Exception as e:
-            title = f"Error in group_invite_friend {group_number} {friend_number}"
-            util_ui.message_box(title +'\n' +str(e), title)
+        self._tox.group_invite_friend(group_number, friend_number)
 
     def process_group_invite(self, friend_number, group_name, invite_data):
         friend = self._get_friend_by_number(friend_number)
@@ -201,7 +188,6 @@ class GroupsService(tox_save.ToxSave):
     # -----------------------------------------------------------------------------------------------------------------
 
     def show_bans_list(self, group):
-        return
         widgets_factory = self._get_widgets_factory()
         self._screen = widgets_factory.create_groups_bans_screen(group)
         self._screen.show()

toxygen/history/database.py

@@ -1,13 +1,7 @@
-# -*- mode: python; indent-tabs-mode: nil; py-indent-offset: 4; coding: utf-8 -*-
 from sqlite3 import connect
 import os.path
 import utils.util as util
 
-# LOG=util.log
-global LOG
-import logging
-LOG = logging.getLogger('app.'+__name__)
-log = lambda x: LOG.info(x)
 
 TIMEOUT = 11
 
@@ -30,30 +24,19 @@ CONTACT_TYPE = {
 class Database:
 
     def __init__(self, path, toxes):
-        self._path = path
-        self._toxes = toxes
+        self._path, self._toxes = path, toxes
         self._name = os.path.basename(path)
-
-    def open(self):
-        path = self._path
-        toxes = self._toxes
-        if not os.path.exists(path):
-            LOG.warn('Db not found: ' +path)
-            return
-        try:
-            with open(path, 'rb') as fin:
-                data = fin.read()
-        except Exception as ex:
-            LOG.error('Db reading error: ' +path +' ' +str(ex))
-            raise
-        try:
-            if toxes.is_data_encrypted(data):
-                data = toxes.pass_decrypt(data)
-                with open(path, 'wb') as fout:
-                    fout.write(data)
-        except Exception as ex:
-            LOG.error('Db writing error: ' +path +' ' + str(ex))
-            os.remove(path)
+        if os.path.exists(path):
+            try:
+                with open(path, 'rb') as fin:
+                    data = fin.read()
+                if toxes.is_data_encrypted(data):
+                    data = toxes.pass_decrypt(data)
+                    with open(path, 'wb') as fout:
+                        fout.write(data)
+            except Exception as ex:
+                util.log('Db reading error: ' + str(ex))
+                os.remove(path)
 
     # -----------------------------------------------------------------------------------------------------------------
     # Public methods
@@ -89,11 +72,9 @@ class Database:
                            '    message_type INTEGER'
                            ')')
             db.commit()
-            return True
-        except Exception as e:
-            LOG("ERROR: " +self._name +' Database exception! ' +str(e))
+        except:
+            print('Database is locked!')
             db.rollback()
-            return False
         finally:
             db.close()
 
@@ -103,11 +84,9 @@ class Database:
             cursor = db.cursor()
             cursor.execute('DROP TABLE id' + tox_id + ';')
             db.commit()
-            return True
-        except Exception as e:
-            LOG("ERROR: " +self._name +' Database exception! ' +str(e))
+        except:
+            print('Database is locked!')
             db.rollback()
-            return False
         finally:
             db.close()
 
@@ -119,11 +98,9 @@ class Database:
                                '(message, author_name, author_type, unix_time, message_type) ' +
                                'VALUES (?, ?, ?, ?, ?, ?);', messages_iter)
             db.commit()
-            return True
-        except Exception as e:
-            LOG("ERROR: " +self._name +' Database exception! ' +str(e))
+        except:
+            print('Database is locked!')
             db.rollback()
-            return False
         finally:
             db.close()
 
@@ -134,11 +111,9 @@ class Database:
             cursor.execute('UPDATE id' + tox_id + ' SET author = 0 '
                            'WHERE id = ' + str(message_id) + ' AND author = 2;')
             db.commit()
-            return True
-        except Exception as e:
-            LOG("ERROR: " +self._name +' Database exception! ' +str(e))
+        except:
+            print('Database is locked!')
             db.rollback()
-            return False
         finally:
             db.close()
 
@@ -148,11 +123,9 @@ class Database:
             cursor = db.cursor()
             cursor.execute('DELETE FROM id' + tox_id + ' WHERE id = ' + str(unique_id) + ';')
             db.commit()
-            return True
-        except Exception as e:
-            LOG("ERROR: " +self._name +' Database exception! ' +str(e))
+        except:
+            print('Database is locked!')
             db.rollback()
-            return False
         finally:
             db.close()
 
@@ -162,11 +135,9 @@ class Database:
             cursor = db.cursor()
             cursor.execute('DELETE FROM id' + tox_id + ';')
             db.commit()
-            return True
-        except Exception as e:
-            LOG("ERROR: " +self._name +' Database exception! ' +str(e))
+        except:
+            print('Database is locked!')
             db.rollback()
-            return False
         finally:
             db.close()
 

toxygen/history/history.py

@@ -1,4 +1,3 @@
-# -*- mode: python; indent-tabs-mode: nil; py-indent-offset: 4; coding: utf-8 -*-
 from history.history_logs_generators import *
 
 
@@ -27,8 +26,7 @@ class History:
         """
         Save history to db
         """
-        # me a mistake? was _db not _history
-        if self._settings['save_history'] or self._settings['save_db']:
+        if self._settings['save_db']:
             for friend in self._contact_provider.get_all_friends():
                 self._db.add_friend_to_db(friend.tox_id)
                 if not self._settings['save_unsent_only']:

toxygen/main.py

@@ -1,424 +1,51 @@
-# -*- mode: python; indent-tabs-mode: nil; py-indent-offset: 4; coding: utf-8 -*-
-import sys
-import os
 import app
-import argparse
-import logging
-import signal
-
-import faulthandler
-faulthandler.enable()
-
-import warnings
-warnings.filterwarnings('ignore')
-
-import tests.support_testing as ts
-try:
-    from trepan.interfaces import server as Mserver
-    from trepan.api import debug
-except:
-    print('trepan3 TCP server NOT enabled.')
-else:
-    import signal
-    try:
-        signal.signal(signal.SIGUSR1, ts.trepan_handler)
-        print('trepan3 TCP server enabled on port 6666.')
-    except: pass
-
 from user_data.settings import *
-from user_data.settings import Settings
-from user_data import settings
 import utils.util as util
-from tests import omain
-with ts.ignoreStderr():
-    import pyaudio
+import argparse
+
 
 __maintainer__ = 'Ingvar'
-__version__ = '0.5.0+'
+__version__ = '0.5.0'
 
-from PyQt5 import QtCore
-import gevent
-if 'QtCore' in sys.modules:
-    def qt_sleep(fSec):
-        if fSec > .001:
-            QtCore.QThread.msleep(int(fSec*1000.0))
-        QtCore.QCoreApplication.processEvents()
-    sleep = qt_sleep
-elif 'gevent' in sys.modules:
-    sleep = gevent.sleep
-else:
-    import time
-    sleep = time.sleep
-
-def reset():
-    Settings.reset_auto_profile()
 
 def clean():
     """Removes libs folder"""
     directory = util.get_libs_directory()
     util.remove(directory)
 
+
+def reset():
+    Settings.reset_auto_profile()
+
+
 def print_toxygen_version():
-    print('Toxygen ' + __version__)
+    print('Toxygen v' + __version__)
 
-def setup_default_audio():
-    # need:
-    audio = ts.get_audio()
-    # unfinished
-    global oPYA
-    oPYA = pyaudio.PyAudio()
-    audio['output_devices'] = dict()
-    i = oPYA.get_device_count()
-    while i > 0:
-        i -= 1
-        if oPYA.get_device_info_by_index(i)['maxOutputChannels'] == 0:
-            continue
-        audio['output_devices'][i] = oPYA.get_device_info_by_index(i)['name']
-    i = oPYA.get_device_count()
-    audio['input_devices'] = dict()
-    while i > 0:
-        i -= 1
-        if oPYA.get_device_info_by_index(i)['maxInputChannels'] == 0:
-            continue
-        audio['input_devices'][i] = oPYA.get_device_info_by_index(i)['name']
-    return audio
 
-def setup_video(oArgs):
-    video = setup_default_video()
-    if oArgs.video_input == '-1':
-        video['device'] = video['output_devices'][1]
-    else:
-        video['device'] = oArgs.video_input
-    return video
-
-def setup_audio(oArgs):
-    global oPYA
-    audio = setup_default_audio()
-    for k,v in audio['input_devices'].items():
-        if v == 'default' and 'input' not in audio :
-            audio['input'] = k
-        if v == getattr(oArgs, 'audio_input'):
-            audio['input'] = k
-            LOG.debug(f"Setting audio['input'] {k} = {v} {k}")
-            break
-    for k,v in audio['output_devices'].items():
-        if v == 'default' and 'output' not in audio:
-            audio['output'] = k
-        if v == getattr(oArgs, 'audio_output'):
-            audio['output'] = k
-            LOG.debug(f"Setting audio['output'] {k} = {v} " +str(k))
-            break
-
-    if hasattr(oArgs, 'mode') and getattr(oArgs, 'mode') > 1:
-        audio['enabled'] = True
-        audio['audio_enabled'] = True
-        audio['video_enabled'] = True
-    elif hasattr(oArgs, 'mode') and getattr(oArgs, 'mode') > 0:
-        audio['enabled'] = True
-        audio['audio_enabled'] = False
-        audio['video_enabled'] = True
-    else:
-        audio['enabled'] = False
-        audio['audio_enabled'] = False
-        audio['video_enabled'] = False
-
-    return audio
-
-    i = getattr(oArgs, 'audio_output')
-    if i >= 0:
-        try:
-            elt = oPYA.get_device_info_by_index(i)
-            if i >= 0 and ( 'maxOutputChannels' not in elt or \
-                            elt['maxOutputChannels'] == 0):
-                LOG.warn(f"Audio output device has no output channels:  {i}")
-                oArgs.audio_output = -1
-        except OSError as e:
-            LOG.warn("Audio output device error looking for maxOutputChannels: " \
-                      +str(i) +' ' +str(e))
-            oArgs.audio_output = -1
-
-    if getattr(oArgs, 'audio_output') < 0:
-        LOG.info("Choose an output device:")
-        i = oPYA.get_device_count()
-        while i > 0:
-            i -= 1
-            if oPYA.get_device_info_by_index(i)['maxOutputChannels'] == 0:
-                continue
-            LOG.info(str(i) \
-                  +' ' +oPYA.get_device_info_by_index(i)['name'] \
-                  +' ' +str(oPYA.get_device_info_by_index(i)['defaultSampleRate'])
-                  )
-        return 0
-
-    i = getattr(oArgs, 'audio_input')
-    if i >= 0:
-        try:
-            elt = oPYA.get_device_info_by_index(i)
-            if i >= 0 and ( 'maxInputChannels' not in elt or \
-                            elt['maxInputChannels'] == 0):
-                LOG.warn(f"Audio input device has no input channels:  {i}")
-                setattr(oArgs, 'audio_input', -1)
-        except OSError as e:
-            LOG.warn("Audio input device error looking for maxInputChannels: " \
-                      +str(i) +' ' +str(e))
-            setattr(oArgs, 'audio_input', -1)
-    if getattr(oArgs, 'audio_input') < 0:
-        LOG.info("Choose an input device:")
-        i = oPYA.get_device_count()
-        while i > 0:
-            i -= 1
-            if oPYA.get_device_info_by_index(i)['maxInputChannels'] == 0:
-                continue
-            LOG.info(str(i) \
-                     +' ' +oPYA.get_device_info_by_index(i)['name']
-                     +' ' +str(oPYA.get_device_info_by_index(i)['defaultSampleRate'])
-                  )
-        return 0
-
-def setup_default_video():
-    default_video = ["-1"]
-    default_video.extend(ts.get_video_indexes())
-    LOG.info(f"Video input choices: {default_video!r}")
-    video = {'device': -1, 'width': 320, 'height': 240, 'x': 0, 'y': 0}
-    video['output_devices'] = default_video
-    return video
-
-def main_parser():
-    import cv2
-    if not os.path.exists('/proc/sys/net/ipv6'):
-        bIpV6 = 'False'
-    else:
-        bIpV6 = 'True'
-    lIpV6Choices=[bIpV6, 'False']
-
-    audio = setup_default_audio()
-    default_video = setup_default_video()
-
-    logfile = os.path.join(os.environ.get('TMPDIR', '/tmp'), 'toxygen.log')
+def main():
     parser = argparse.ArgumentParser()
     parser.add_argument('--version', action='store_true', help='Prints Toxygen version')
     parser.add_argument('--clean', action='store_true', help='Delete toxcore libs from libs folder')
     parser.add_argument('--reset', action='store_true', help='Reset default profile')
-    parser.add_argument('--uri', type=str, default='',
-                        help='Add specified Tox ID to friends')
-    parser.add_argument('--logfile', default=logfile,
-                        help='Filename for logging')
-    parser.add_argument('--loglevel', type=int, default=logging.INFO,
-                        help='Threshold for logging (lower is more) default: 20')
-    parser.add_argument('--proxy_host', '--proxy-host', type=str,
-                        # oddball - we want to use '' as a setting
-                        default='0.0.0.0',
-                        help='proxy host')
-    parser.add_argument('--proxy_port', '--proxy-port', default=0, type=int,
-                        help='proxy port')
-    parser.add_argument('--proxy_type', '--proxy-type', default=0, type=int,
-                        choices=[0,1,2],
-                        help='proxy type 1=https, 2=socks')
-    parser.add_argument('--tcp_port', '--tcp-port', default=0, type=int,
-                        help='tcp port')
-    parser.add_argument('--auto_accept_path', '--auto-accept-path', type=str,
-                        default=os.path.join(os.environ['HOME'], 'Downloads'),
-                        help="auto_accept_path")
-    parser.add_argument('--mode', type=int, default=2,
-                        help='Mode: 0=chat 1=chat+audio 2=chat+audio+video default: 0')
-    parser.add_argument('--font', type=str, default="Courier",
-                        help='Message font')
-    parser.add_argument('--message_font_size', type=int, default=15,
-                        help='Font size in pixels')
-    parser.add_argument('--local_discovery_enabled',type=str,
-                        default='False', choices=['True','False'],
-                        help='Look on the local lan')
-    parser.add_argument('--udp_enabled',type=str,
-                        default='True', choices=['True','False'],
-                        help='En/Disable udp')
-    parser.add_argument('--ipv6_enabled',type=str,
-                        default=bIpV6, choices=lIpV6Choices,
-                        help='En/Disable ipv6')
-    parser.add_argument('--compact_mode',type=str,
-                        default='True', choices=['True','False'],
-                        help='Compact mode')
-    parser.add_argument('--allow_inline',type=str,
-                        default='False', choices=['True','False'],
-                        help='Dis/Enable allow_inline')
-    parser.add_argument('--notifications',type=str,
-                        default='True', choices=['True','False'],
-                        help='Dis/Enable notifications')
-    parser.add_argument('--sound_notifications',type=str,
-                        default='True', choices=['True','False'],
-                        help='Enable sound notifications')
-    parser.add_argument('--calls_sound',type=str,
-                        default='True', choices=['True','False'],
-                        help='Enable calls_sound')
-    parser.add_argument('--core_logging',type=str,
-                        default='False', choices=['True','False'],
-                        help='Dis/Enable Toxcore notifications')
-    parser.add_argument('--hole_punching_enabled',type=str,
-                        default='False', choices=['True','False'],
-                        help='En/Enable hole punching')
-    parser.add_argument('--dht_announcements_enabled',type=str,
-                        default='True', choices=['True','False'],
-                        help='En/Disable DHT announcements')
-    parser.add_argument('--save_history',type=str,
-                        default='True', choices=['True','False'],
-                        help='En/Disable save history')
-    parser.add_argument('--update', type=int, default=0,
-                        choices=[0,0],
-                        help='Update program (broken)')
-    parser.add_argument('--download_nodes_list',type=str,
-                        default='False', choices=['True','False'],
-                        help='Download nodes list')
-    parser.add_argument('--nodes_json', type=str,
-                        default='')
-    parser.add_argument('--download_nodes_url', type=str,
-                        default='https://nodes.tox.chat/json')
-    parser.add_argument('--network', type=str,
-                        choices=['main', 'new', 'local', 'newlocal'],
-                        default='new')
-    parser.add_argument('--video_input', type=str,
-                        default=-1,
-                        choices=default_video['output_devices'],
-                        help="Video input device number - /dev/video?")
-    parser.add_argument('--audio_input', type=str,
-                        default=oPYA.get_default_input_device_info()['name'],
-                        choices=audio['input_devices'].values(),
-                        help="Audio input device name - aplay -L for help")
-    parser.add_argument('--audio_output', type=str,
-                        default=oPYA.get_default_output_device_info()['index'],
-                        choices=audio['output_devices'].values(),
-                        help="Audio output device number - -1 for help")
-    parser.add_argument('--theme', type=str, default='default',
-                        choices=['dark', 'default'],
-                        help='Theme - style of UI')
-    parser.add_argument('--sleep', type=str, default='time',
-                        # could expand this to tk, gtk, gevent...
-                        choices=['qt','gevent','time'],
-                        help='Sleep method - one of qt, gevent , time')
-    supported_languages = settings.supported_languages()
-    parser.add_argument('--language', type=str, default='English',
-                        choices=supported_languages,
-                        help='Languages')
-    parser.add_argument('profile', type=str, nargs='?', default=None,
-                        help='Path to Tox profile')
-    return parser
+    parser.add_argument('--uri', help='Add specified Tox ID to friends')
+    parser.add_argument('profile', nargs='?', default=None, help='Path to Tox profile')
+    args = parser.parse_args()
 
-# clean out the unchanged settings so these can override the profile
-lKEEP_SETTINGS = ['uri',
-	'profile',
-	'loglevel',
-	'logfile',
-	'mode',
-	'audio',
-        'video',
-        'ipv6_enabled',
-	'udp_enabled',
-	'local_discovery_enabled',
-        'theme',
-	'network',
-	'message_font_size',
-	'font',
-        'save_history',
-	'language',
-	'update',
-        'proxy_host',
-	'proxy_type',
-        'proxy_port',
-        'core_logging',
-        'audio',
-        'video'
-        ] # , 'nodes_json'
-lBOOLEANS = [
-        'local_discovery_enabled',
-        'udp_enabled',
-        'ipv6_enabled',
-        'compact_mode',
-        'allow_inline',
-        'notifications',
-        'sound_notifications',
-        'hole_punching_enabled',
-        'dht_announcements_enabled',
-        'save_history',
-        'download_nodes_list'
-        'core_logging',
-        ]
-
-class A(): pass
-
-global oAPP
-oAPP = None
-def main(lArgs):
-    global oPYA
-    from argparse import Namespace
-    parser = main_parser()
-    default_ns = parser.parse_args([])
-    oArgs = parser.parse_args(lArgs)
-
-    if oArgs.version:
+    if args.version:
         print_toxygen_version()
-        return 0
+        return
 
-    if oArgs.clean:
+    if args.clean:
         clean()
-        return 0
+        return
 
-    if oArgs.reset:
+    if args.reset:
         reset()
-        return 0
+        return
 
-    # if getattr(oArgs, 'network') in ['newlocal', 'localnew']: oArgs.network = 'new'
+    toxygen = app.App(__version__, args.profile, args.uri)
+    toxygen.main()
 
-    # clean out the unchanged settings so these can override the profile
-    for key in default_ns.__dict__.keys():
-        if key in lKEEP_SETTINGS: continue
-        if not hasattr(oArgs, key): continue
-        if getattr(default_ns, key) == getattr(oArgs, key):
-            delattr(oArgs, key)
-
-    for key in lBOOLEANS:
-        if not hasattr(oArgs, key): continue
-        val = getattr(oArgs, key)
-        if type(val) == bool: continue
-        if val in ['False', 'false', '0']:
-            setattr(oArgs, key, False)
-        else:
-            setattr(oArgs, key, True)
-
-    aArgs = A()
-    for key in oArgs.__dict__.keys():
-        setattr(aArgs, key, getattr(oArgs, key))
-    setattr(aArgs, 'video', setup_video(oArgs))
-    aArgs.video = setup_video(oArgs)
-    assert 'video' in aArgs.__dict__
-    
-    setattr(aArgs, 'audio', setup_audio(oArgs))
-    aArgs.audio = setup_audio(oArgs)
-    assert 'audio' in aArgs.__dict__
-    
-    oArgs = aArgs
-    toxygen = app.App(__version__, oArgs)
-    global oAPP
-    oAPP = toxygen
-    i = toxygen.iMain()
-    return i
 
 if __name__ == '__main__':
-    iRet = 0
-    try:
-        iRet = main(sys.argv[1:])
-    except KeyboardInterrupt:
-        iRet = 0
-    except SystemExit as e:
-        iRet = e
-    except Exception as e:
-        import traceback
-        sys.stderr.write(f"Exception from main  {e}" \
-                         +'\n' + traceback.format_exc() +'\n' )
-        iRet = 1
-
-    # Exception ignored in: <module 'threading' from '/usr/lib/python3.9/threading.py'>
-    # File "/usr/lib/python3.9/threading.py", line 1428, in _shutdown
-    # lock.acquire()
-    # gevent.exceptions.LoopExit as e:
-    # This operation would block forever
-    sys.stderr.write('Calling sys.exit' +'\n')
-    with ts.ignoreStdout():
-        sys.exit(iRet)
+    main()

toxygen/messenger/messages.py

@@ -38,8 +38,8 @@ class Message:
 
     MESSAGE_ID = 0
 
-    def __init__(self, message_type, author, iTime):
-        self._time = iTime
+    def __init__(self, message_type, author, time):
+        self._time = time
         self._type = message_type
         self._author = author
         self._widget = None
@@ -66,7 +66,6 @@ class Message:
     message_id = property(get_message_id)
 
     def get_widget(self, *args):
-        # FixMe
         self._widget = self._create_widget(*args)
 
         return self._widget
@@ -82,7 +81,6 @@ class Message:
             self._widget.mark_as_sent()
 
     def _create_widget(self, *args):
-        # overridden
         pass
 
     @staticmethod
@@ -97,8 +95,8 @@ class TextMessage(Message):
     Plain text or action message
     """
 
-    def __init__(self, message, owner, iTime, message_type, message_id=0):
-        super().__init__(message_type, owner, iTime)
+    def __init__(self, message, owner, time, message_type, message_id=0):
+        super().__init__(message_type, owner, time)
         self._message = message
         self._id = message_id
 
@@ -121,8 +119,8 @@ class TextMessage(Message):
 
 class OutgoingTextMessage(TextMessage):
 
-    def __init__(self, message, owner, iTime, message_type, tox_message_id=0):
-        super().__init__(message, owner, iTime, message_type)
+    def __init__(self, message, owner, time, message_type, tox_message_id=0):
+        super().__init__(message, owner, time, message_type)
         self._tox_message_id = tox_message_id
 
     def get_tox_message_id(self):
@@ -136,8 +134,8 @@ class OutgoingTextMessage(TextMessage):
 
 class GroupChatMessage(TextMessage):
 
-    def __init__(self, id, message, owner, iTime, message_type, name):
-        super().__init__(id, message, owner, iTime, message_type)
+    def __init__(self, id, message, owner, time, message_type, name):
+        super().__init__(id, message, owner, time, message_type)
         self._user_name = name
 
 
@@ -146,8 +144,8 @@ class TransferMessage(Message):
     Message with info about file transfer
     """
 
-    def __init__(self, author, iTime, state, size, file_name, friend_number, file_number):
-        super().__init__(MESSAGE_TYPE['FILE_TRANSFER'], author, iTime)
+    def __init__(self, author, time, state, size, file_name, friend_number, file_number):
+        super().__init__(MESSAGE_TYPE['FILE_TRANSFER'], author, time)
         self._state = state
         self._size = size
         self._file_name = file_name
@@ -187,10 +185,10 @@ class TransferMessage(Message):
 
     file_name = property(get_file_name)
 
-    def transfer_updated(self, state, percentage, iTime):
+    def transfer_updated(self, state, percentage, time):
         self._state = state
         if self._widget is not None:
-            self._widget.update_transfer_state(state, percentage, iTime)
+            self._widget.update_transfer_state(state, percentage, time)
 
     def _create_widget(self, *args):
         return FileTransferItem(self, *args)
@@ -198,9 +196,9 @@ class TransferMessage(Message):
 
 class UnsentFileMessage(TransferMessage):
 
-    def __init__(self, path, data, iTime, author, size, friend_number):
+    def __init__(self, path, data, time, author, size, friend_number):
         file_name = os.path.basename(path)
-        super().__init__(author, iTime, FILE_TRANSFER_STATE['UNSENT'], size, file_name, friend_number, -1)
+        super().__init__(author, time, FILE_TRANSFER_STATE['UNSENT'], size, file_name, friend_number, -1)
         self._data, self._path = data, path
 
     def get_data(self):
@@ -237,5 +235,5 @@ class InlineImageMessage(Message):
 
 class InfoMessage(TextMessage):
 
-    def __init__(self, message, iTime):
-        super().__init__(message, None, iTime, MESSAGE_TYPE['INFO_MESSAGE'])
+    def __init__(self, message, time):
+        super().__init__(message, None, time, MESSAGE_TYPE['INFO_MESSAGE'])

toxygen/messenger/messenger.py

@@ -1,12 +1,6 @@
-# -*- mode: python; indent-tabs-mode: nil; py-indent-offset: 4; coding: utf-8 -*-
 import common.tox_save as tox_save
 from messenger.messages import *
-from tests.support_testing import assert_main_thread
 
-global LOG
-import logging
-LOG = logging.getLogger('app.'+__name__)
-log = lambda x: LOG.info(x)
 
 class Messenger(tox_save.ToxSave):
 
@@ -82,7 +76,6 @@ class Messenger(tox_save.ToxSave):
 
         if not text or friend_number < 0:
             return
-        assert_main_thread()
 
         friend = self._get_friend_by_number(friend_number)
         messages = self._split_message(text.encode('utf-8'))
@@ -113,7 +106,7 @@ class Messenger(tox_save.ToxSave):
                 message_id = self._tox.friend_send_message(friend_number, message.type, message.text.encode('utf-8'))
                 message.tox_message_id = message_id
         except Exception as ex:
-            LOG.warn('Sending pending messages failed with ' + str(ex))
+            util.log('Sending pending messages failed with ' + str(ex))
 
     # -----------------------------------------------------------------------------------------------------------------
     # Messaging - groups
@@ -149,9 +142,6 @@ class Messenger(tox_save.ToxSave):
         t = util.get_unix_time()
         group = self._get_group_by_number(group_number)
         peer = group.get_peer_by_id(peer_id)
-        if not peer:
-            LOG.warn('FixMe new_group_message group.get_peer_by_id ' + str(peer_id))
-            return
         text_message = TextMessage(message, MessageAuthor(peer.name, MESSAGE_AUTHOR['GC_PEER']), t, message_type)
         self._add_message(text_message, group)
 
@@ -168,7 +158,6 @@ class Messenger(tox_save.ToxSave):
 
         if not text or group_number < 0 or peer_id < 0:
             return
-        assert_main_thread()
 
         group_peer_contact = self._contacts_manager.get_or_create_group_peer_contact(group_number, peer_id)
         group = self._get_group_by_number(group_number)
@@ -193,9 +182,6 @@ class Messenger(tox_save.ToxSave):
         t = util.get_unix_time()
         group = self._get_group_by_number(group_number)
         peer = group.get_peer_by_id(peer_id)
-        if not peer:
-            LOG.warn('FixMe new_group_private_message group.get_peer_by_id ' + str(peer_id))
-            return
         text_message = TextMessage(message, MessageAuthor(peer.name, MESSAGE_AUTHOR['GC_PEER']),
                                    t, message_type)
         group_peer_contact = self._contacts_manager.get_or_create_group_peer_contact(group_number, peer_id)
@@ -305,12 +291,10 @@ class Messenger(tox_save.ToxSave):
             self._create_info_message_item(message)
 
     def _create_info_message_item(self, message):
-        assert_main_thread()
         self._items_factory.create_message_item(message)
         self._screen.messages.scrollToBottom()
 
     def _add_message(self, text_message, contact):
-        assert_main_thread()
         if self._contacts_manager.is_contact_active(contact):  # add message to list
             self._create_message_item(text_message)
             self._screen.messages.scrollToBottom()

toxygen/middleware/callbacks.py

@@ -1,40 +1,15 @@
-# -*- mode: python; indent-tabs-mode: nil; py-indent-offset: 4; coding: utf-8 -*-
-import os
-import threading
 from PyQt5 import QtGui
 from wrapper.toxcore_enums_and_consts import *
 from wrapper.toxav_enums import *
 from wrapper.tox import bin_to_string
 import utils.ui as util_ui
 import utils.util as util
+import cv2
+import numpy as np
 from middleware.threads import invoke_in_main_thread, execute
 from notifications.tray import tray_notification
 from notifications.sound import *
-from datetime import datetime
-
-iMAX_INT32 = 4294967295
-def LOG_ERROR(l): print('ERRORc: '+l)
-def LOG_WARN(l): print('WARNc: '+l)
-def LOG_INFO(l): print('INFOc: '+l)
-def LOG_DEBUG(l): print('DEBUGc: '+l)
-def LOG_TRACE(l): pass # print('TRACE+ '+l)
-
-global aTIMES
-aTIMES=dict()
-def bTooSoon(key, sSlot, fSec=10.0):
-    # rate limiting
-    global aTIMES
-    if sSlot not in aTIMES:
-        aTIMES[sSlot] = dict()
-    OTIME = aTIMES[sSlot]
-    now = datetime.now()
-    if key not in OTIME:
-        OTIME[key] = now
-        return False
-    delta = now - OTIME[key]
-    OTIME[key] = now
-    if delta.total_seconds() < fSec: return True
-    return False
+import threading
 
 # TODO: refactoring. Use contact provider instead of manager
 
@@ -42,48 +17,15 @@ def bTooSoon(key, sSlot, fSec=10.0):
 # Callbacks - current user
 # -----------------------------------------------------------------------------------------------------------------
 
-global iBYTES
-iBYTES=0
-def sProcBytes(sFile=None):
-    global iBYTES
-    if sFile is None:
-        pid = os.getpid()
-        sFile = f"/proc/{pid}/net/softnet_stat"
-    if os.path.exists(sFile):
-        total = 0
-        with open(sFile, 'r') as iFd:
-            for elt in iFd.readlines():
-                i = elt.find(' ')
-                p = int(elt[:i], 16)
-                total = total + p
-        if iBYTES == 0:
-            iBYTES = total
-            return ''
-        diff = total - iBYTES
-        s = f' {diff // 1024} Kbytes'
-    else:
-        s = ''
-    return s
 
 def self_connection_status(tox, profile):
     """
     Current user changed connection status (offline, TCP, UDP)
     """
-    pid = os.getpid()
-    sFile = '/proc/'+str(pid) +'/net/softnet_stat'
-    sSlot = 'self connection status'
     def wrapped(tox_link, connection, user_data):
-        key = f"connection {connection}"
-        if bTooSoon(key, sSlot, 10): return
-        s = sProcBytes(sFile)
-        try:
-            status = tox.self_get_status() if connection != TOX_CONNECTION['NONE'] else None
-            if status:
-                LOG_DEBUG(f"self_connection_status: connection={connection} status={status}" +' '+s)
-            invoke_in_main_thread(profile.set_status, status)
-        except Exception as e:
-            LOG_ERROR(f"self_connection_status: {e}")
-            pass
+        print('Connection status: ', str(connection))
+        status = tox.self_get_status() if connection != TOX_CONNECTION['NONE'] else None
+        invoke_in_main_thread(profile.set_status, status)
 
     return wrapped
 
@@ -94,17 +36,13 @@ def self_connection_status(tox, profile):
 
 
 def friend_status(contacts_manager, file_transfer_handler, profile, settings):
-    sSlot = 'friend status'
     def wrapped(tox, friend_number, new_status, user_data):
         """
         Check friend's status (none, busy, away)
         """
-        LOG_DEBUG(f"Friend's #{friend_number} status changed")
-        key = f"friend_number {friend_number}"
-        if bTooSoon(key, sSlot, 10): return
+        print("Friend's #{} status changed!".format(friend_number))
         friend = contacts_manager.get_friend_by_number(friend_number)
-        if friend.status is None and settings['sound_notifications'] and \
-          profile.status != TOX_USER_STATUS['BUSY']:
+        if friend.status is None and settings['sound_notifications'] and profile.status != TOX_USER_STATUS['BUSY']:
             sound_notification(SOUND_NOTIFICATION['FRIEND_CONNECTION_STATUS'])
         invoke_in_main_thread(friend.set_status, new_status)
 
@@ -123,7 +61,7 @@ def friend_connection_status(contacts_manager, profile, settings, plugin_loader,
         """
         Check friend's connection status (offline, udp, tcp)
         """
-        LOG_DEBUG(f"Friend #{friend_number} connection status: {new_status}")
+        print("Friend #{} connection status: {}".format(friend_number, new_status))
         friend = contacts_manager.get_friend_by_number(friend_number)
         if new_status == TOX_CONNECTION['NONE']:
             invoke_in_main_thread(friend.set_status, None)
@@ -141,14 +79,11 @@ def friend_connection_status(contacts_manager, profile, settings, plugin_loader,
 
 
 def friend_name(contacts_provider, messenger):
-    sSlot = 'friend_name'
     def wrapped(tox, friend_number, name, size, user_data):
         """
         Friend changed his name
         """
-        key = f"friend_number={friend_number}"
-        if bTooSoon(key, sSlot, 60): return
-        LOG_DEBUG(f'New name friend #' + str(friend_number))
+        print('New name friend #' + str(friend_number))
         friend = contacts_provider.get_friend_by_number(friend_number)
         old_name = friend.name
         new_name = str(name, 'utf-8')
@@ -157,19 +92,16 @@ def friend_name(contacts_provider, messenger):
 
     return wrapped
 
+
 def friend_status_message(contacts_manager, messenger):
-    sSlot = 'status_message'
     def wrapped(tox, friend_number, status_message, size, user_data):
         """
         :return: function for callback friend_status_message. It updates friend's status message
         and calls window repaint
         """
         friend = contacts_manager.get_friend_by_number(friend_number)
-        key = f"friend_number={friend_number}"
-        if bTooSoon(key, sSlot, 10): return
-                
         invoke_in_main_thread(friend.set_status_message, str(status_message, 'utf-8'))
-        LOG_DEBUG(f'User #{friend_number} has new status message')
+        print('User #{} has new status message'.format(friend_number))
         invoke_in_main_thread(messenger.send_messages, friend_number)
 
     return wrapped
@@ -180,7 +112,6 @@ def friend_message(messenger, contacts_manager, profile, settings, window, tray)
         """
         New message from friend
         """
-        LOG_DEBUG(f"friend_message #{friend_number}")
         message = str(message, 'utf-8')
         invoke_in_main_thread(messenger.new_message, friend_number, message_type, message)
         if not window.isActiveWindow():
@@ -190,8 +121,7 @@ def friend_message(messenger, contacts_manager, profile, settings, window, tray)
             if settings['sound_notifications'] and profile.status != TOX_USER_STATUS['BUSY']:
                 sound_notification(SOUND_NOTIFICATION['MESSAGE'])
             icon = os.path.join(util.get_images_directory(), 'icon_new_messages.png')
-            if tray:
-                invoke_in_main_thread(tray.setIcon, QtGui.QIcon(icon))
+            invoke_in_main_thread(tray.setIcon, QtGui.QIcon(icon))
 
     return wrapped
 
@@ -201,7 +131,7 @@ def friend_request(contacts_manager):
         """
         Called when user get new friend request
         """
-        LOG_DEBUG(f'Friend request')
+        print('Friend request')
         key = ''.join(chr(x) for x in public_key[:TOX_PUBLIC_KEY_SIZE])
         tox_id = bin_to_string(key, TOX_PUBLIC_KEY_SIZE)
         invoke_in_main_thread(contacts_manager.process_friend_request, tox_id, str(message, 'utf-8'))
@@ -210,12 +140,9 @@ def friend_request(contacts_manager):
 
 
 def friend_typing(messenger):
-    sSlot = "friend_typing"
     def wrapped(tox, friend_number, typing, user_data):
-        key = f"friend_number={friend_number}"
-        if bTooSoon(key, sSlot, 10): return
-        LOG_DEBUG(f"friend_typing #{friend_number}")
         invoke_in_main_thread(messenger.friend_typing, friend_number, typing)
+
     return wrapped
 
 
@@ -237,7 +164,7 @@ def tox_file_recv(window, tray, profile, file_transfer_handler, contacts_manager
     """
     def wrapped(tox, friend_number, file_number, file_type, size, file_name, file_name_size, user_data):
         if file_type == TOX_FILE_KIND['DATA']:
-            LOG_DEBUG(f'file_transfer_handler File')
+            print('File')
             try:
                 file_name = str(file_name[:file_name_size], 'utf-8')
             except:
@@ -257,7 +184,7 @@ def tox_file_recv(window, tray, profile, file_transfer_handler, contacts_manager
                 icon = util.join_path(util.get_images_directory(), 'icon_new_messages.png')
                 invoke_in_main_thread(tray.setIcon, QtGui.QIcon(icon))
         else:  # avatar
-            LOG_DEBUG(f'file_transfer_handler Avatar')
+            print('Avatar')
             invoke_in_main_thread(file_transfer_handler.incoming_avatar,
                                   friend_number,
                                   file_number,
@@ -332,17 +259,15 @@ def lossy_packet(plugin_loader):
 # -----------------------------------------------------------------------------------------------------------------
 
 def call_state(calls_manager):
-    def wrapped(iToxav, friend_number, mask, user_data):
+    def wrapped(toxav, friend_number, mask, user_data):
         """
         New call state
         """
-        LOG_DEBUG(f"call_state #{friend_number}")
+        print(friend_number, mask)
         if mask == TOXAV_FRIEND_CALL_STATE['FINISHED'] or mask == TOXAV_FRIEND_CALL_STATE['ERROR']:
             invoke_in_main_thread(calls_manager.stop_call, friend_number, True)
         else:
-            # guessing was calls_manager.
-            #? incoming_call
-            calls_manager._call.toxav_call_state_cb(friend_number, mask)
+            calls_manager.toxav_call_state_cb(friend_number, mask)
 
     return wrapped
 
@@ -352,7 +277,7 @@ def call(calls_manager):
         """
         Incoming call from friend
         """
-        LOG_DEBUG(f"Incoming call from {friend_number} {audio} {video}")
+        print(friend_number, audio, video)
         invoke_in_main_thread(calls_manager.incoming_call, audio, video, friend_number)
 
     return wrapped
@@ -363,9 +288,7 @@ def callback_audio(calls_manager):
         """
         New audio chunk
         """
-        LOG_DEBUG(f"callback_audio #{friend_number}")
-        # guessing was .call
-        calls_manager._call.audio_chunk(
+        calls_manager.call.audio_chunk(
             bytes(samples[:audio_samples_per_channel * 2 * audio_channels_count]),
             audio_channels_count,
             rate)
@@ -401,9 +324,6 @@ def video_receive_frame(toxav, friend_number, width, height, y, u, v, ystride, u
 
     It can be created from initial y, u, v using slices
     """
-    LOG_DEBUG(f"video_receive_frame from {friend_number}")
-    import cv2
-    import numpy as np
     try:
         y_size = abs(max(width, abs(ystride)))
         u_size = abs(max(width // 2, abs(ustride)))
@@ -429,8 +349,7 @@ def video_receive_frame(toxav, friend_number, width, height, y, u, v, ystride, u
 
         invoke_in_main_thread(cv2.imshow, str(friend_number), frame)
     except Exception as ex:
-        LOG_ERROR(f"video_receive_frame  {ex} #{friend_number}")
-        pass
+        print(ex)
 
 # -----------------------------------------------------------------------------------------------------------------
 # Callbacks - groups
@@ -442,23 +361,18 @@ def group_message(window, tray, tox, messenger, settings, profile):
     New message in group chat
     """
     def wrapped(tox_link, group_number, peer_id, message_type, message, length, user_data):
-        LOG_DEBUG(f"group_message #{group_number}")
         message = str(message[:length], 'utf-8')
         invoke_in_main_thread(messenger.new_group_message, group_number, message_type, message, peer_id)
         if window.isActiveWindow():
             return
         bl = settings['notify_all_gc'] or profile.name in message
         name = tox.group_peer_get_name(group_number, peer_id)
-        if settings['sound_notifications'] and bl and \
-           profile.status != TOX_USER_STATUS['BUSY']:
+        if settings['notifications'] and profile.status != TOX_USER_STATUS['BUSY'] and (not settings.locked) and bl:
+            invoke_in_main_thread(tray_notification, name, message, tray, window)
+        if settings['sound_notifications'] and bl and profile.status != TOX_USER_STATUS['BUSY']:
             sound_notification(SOUND_NOTIFICATION['MESSAGE'])
-        if False and settings['tray_icon']:
-            if settings['notifications'] and \
-               profile.status != TOX_USER_STATUS['BUSY'] and \
-                   (not settings.locked) and bl:
-                invoke_in_main_thread(tray_notification, name, message, tray, window)
-            icon = util.join_path(util.get_images_directory(), 'icon_new_messages.png')
-            invoke_in_main_thread(tray.setIcon, QtGui.QIcon(icon))
+        icon = util.join_path(util.get_images_directory(), 'icon_new_messages.png')
+        invoke_in_main_thread(tray.setIcon, QtGui.QIcon(icon))
 
     return wrapped
 
@@ -468,7 +382,6 @@ def group_private_message(window, tray, tox, messenger, settings, profile):
     New private message in group chat
     """
     def wrapped(tox_link, group_number, peer_id, message_type, message, length, user_data):
-        LOG_DEBUG(f"group_private_message #{group_number}")
         message = str(message[:length], 'utf-8')
         invoke_in_main_thread(messenger.new_group_private_message, group_number, message_type, message, peer_id)
         if window.isActiveWindow():
@@ -487,15 +400,13 @@ def group_private_message(window, tray, tox, messenger, settings, profile):
 
 def group_invite(window, settings, tray, profile, groups_service, contacts_provider):
     def wrapped(tox, friend_number, invite_data, length, group_name, group_name_length, user_data):
-        LOG_DEBUG(f"group_invite friend_number={friend_number}")
         group_name = str(bytes(group_name[:group_name_length]), 'utf-8')
         invoke_in_main_thread(groups_service.process_group_invite,
                               friend_number, group_name,
                               bytes(invite_data[:length]))
         if window.isActiveWindow():
             return
-        if settings['notifications'] and \
-           profile.status != TOX_USER_STATUS['BUSY'] and not settings.locked:
+        if settings['notifications'] and profile.status != TOX_USER_STATUS['BUSY'] and not settings.locked:
             friend = contacts_provider.get_friend_by_number(friend_number)
             title = util_ui.tr('New invite to group chat')
             text = util_ui.tr('{} invites you to group "{}"').format(friend.name, group_name)
@@ -508,7 +419,6 @@ def group_invite(window, settings, tray, profile, groups_service, contacts_provi
 
 def group_self_join(contacts_provider, contacts_manager, groups_service):
     def wrapped(tox, group_number, user_data):
-        LOG_DEBUG(f"group_self_join #{group_number}")
         group = contacts_provider.get_group_by_number(group_number)
         invoke_in_main_thread(group.set_status, TOX_USER_STATUS['NONE'])
         invoke_in_main_thread(groups_service.update_group_info, group)
@@ -518,15 +428,8 @@ def group_self_join(contacts_provider, contacts_manager, groups_service):
 
 
 def group_peer_join(contacts_provider, groups_service):
-    sSlot = "group_peer_join"
     def wrapped(tox, group_number, peer_id, user_data):
-        key = f"group_peer_join #{group_number} peer_id={peer_id}"
-        if bTooSoon(key, sSlot, 20): return
         group = contacts_provider.get_group_by_number(group_number)
-        if peer_id > group._peers_limit:
-            LOG_ERROR(key +f" {peer_id} > {group._peers_limit}")
-            return
-        LOG_DEBUG(key)
         group.add_peer(peer_id)
         invoke_in_main_thread(groups_service.generate_peers_list)
         invoke_in_main_thread(groups_service.update_group_info, group)
@@ -536,41 +439,28 @@ def group_peer_join(contacts_provider, groups_service):
 
 def group_peer_exit(contacts_provider, groups_service, contacts_manager):
     def wrapped(tox, group_number, peer_id, message, length, user_data):
-        LOG_DEBUG(f"group_peer_exit #{group_number} peer_id={peer_id}")
         group = contacts_provider.get_group_by_number(group_number)
         group.remove_peer(peer_id)
         invoke_in_main_thread(groups_service.generate_peers_list)
 
     return wrapped
 
+
 def group_peer_name(contacts_provider, groups_service):
     def wrapped(tox, group_number, peer_id, name, length, user_data):
-        LOG_DEBUG(f"group_peer_name #{group_number} peer_id={peer_id}")
         group = contacts_provider.get_group_by_number(group_number)
         peer = group.get_peer_by_id(peer_id)
-        if peer:
-            peer.name = str(name[:length], 'utf-8')
-            invoke_in_main_thread(groups_service.generate_peers_list)
-        else:
-            # FixMe: known signal to revalidate roles...
-            #_peers = [(p._name, p._peer_id) for p in group.get_peers()]
-            LOG_TRACE(f"remove_peer group {group!r} has no peer_id={peer_id} in _peers!r")
-            return
+        peer.name = str(name[:length], 'utf-8')
+        invoke_in_main_thread(groups_service.generate_peers_list)
 
     return wrapped
 
 
 def group_peer_status(contacts_provider, groups_service):
     def wrapped(tox, group_number, peer_id, peer_status, user_data):
-        LOG_DEBUG(f"group_peer_status #{group_number} peer_id={peer_id}")
         group = contacts_provider.get_group_by_number(group_number)
         peer = group.get_peer_by_id(peer_id)
-        if peer:
-            peer.status = peer_status
-        else:
-            # _peers = [(p._name, p._peer_id) for p in group.get_peers()]
-            LOG_TRACE(f"remove_peer group {group!r} has no peer_id={peer_id} in _peers!r")
-        # TODO: add info message
+        peer.status = peer_status
         invoke_in_main_thread(groups_service.generate_peers_list)
 
     return wrapped
@@ -578,62 +468,32 @@ def group_peer_status(contacts_provider, groups_service):
 
 def group_topic(contacts_provider):
     def wrapped(tox, group_number, peer_id, topic, length, user_data):
-        LOG_DEBUG(f"group_topic #{group_number} peer_id={peer_id}")
         group = contacts_provider.get_group_by_number(group_number)
-        if group:
-            topic = str(topic[:length], 'utf-8')
-            invoke_in_main_thread(group.set_status_message, topic)
-        else:
-            _peers = [(p._name, p._peer_id) for p in group.get_peers()]
-            LOG_WARN(f"group_topic {group!r} has no peer_id={peer_id} in {_peers!r}")
-        # TODO: add info message
+        topic = str(topic[:length], 'utf-8')
+        invoke_in_main_thread(group.set_status_message, topic)
 
     return wrapped
 
+
 def group_moderation(groups_service, contacts_provider, contacts_manager, messenger):
+
     def update_peer_role(group, mod_peer_id, peer_id, new_role):
         peer = group.get_peer_by_id(peer_id)
-        if peer:
-            peer.role = new_role
-            # TODO: add info message
-        else:
-            # FixMe: known signal to revalidate roles...
-            # _peers = [(p._name, p._peer_id) for p in group.get_peers()]
-            LOG_TRACE(f"update_peer_role group {group!r} has no peer_id={peer_id} in _peers!r")
+        peer.role = new_role
         # TODO: add info message
 
     def remove_peer(group, mod_peer_id, peer_id, is_ban):
-        peer = group.get_peer_by_id(peer_id)
-        if peer:
-            contacts_manager.remove_group_peer_by_id(group, peer_id)
-            group.remove_peer(peer_id)
-        else:
-            # FixMe: known signal to revalidate roles...
-            #_peers = [(p._name, p._peer_id) for p in group.get_peers()]
-            LOG_TRACE(f"remove_peer group {group!r} has no peer_id={peer_id} in _peers!r")
+        contacts_manager.remove_group_peer_by_id(group, peer_id)
+        group.remove_peer(peer_id)
         # TODO: add info message
 
-    # source_peer_number, target_peer_number,
     def wrapped(tox, group_number, mod_peer_id, peer_id, event_type, user_data):
-        if mod_peer_id == iMAX_INT32 or peer_id == iMAX_INT32:
-            # FixMe: known signal to revalidate roles...
-            return
-        LOG_DEBUG(f"group_moderation #{group_number} mod_id={mod_peer_id} peer_id={peer_id} event_type={event_type}")
         group = contacts_provider.get_group_by_number(group_number)
-        mod_peer = group.get_peer_by_id(mod_peer_id)
-        if not mod_peer:
-            #_peers = [(p._name, p._peer_id) for p in group.get_peers()]
-            LOG_TRACE(f"remove_peer group {group!r} has no mod_peer_id={mod_peer_id} in _peers!r")
-            return
-        peer = group.get_peer_by_id(peer_id)
-        if not peer:
-            # FixMe: known signal to revalidate roles...
-            #_peers = [(p._name, p._peer_id) for p in group.get_peers()]
-            LOG_TRACE(f"remove_peer group {group!r} has no peer_id={peer_id} in _peers!r")
-            return
 
         if event_type == TOX_GROUP_MOD_EVENT['KICK']:
             remove_peer(group, mod_peer_id, peer_id, False)
+        elif event_type == TOX_GROUP_MOD_EVENT['BAN']:
+            remove_peer(group, mod_peer_id, peer_id, True)
         elif event_type == TOX_GROUP_MOD_EVENT['OBSERVER']:
             update_peer_role(group, mod_peer_id, peer_id, TOX_GROUP_ROLE['OBSERVER'])
         elif event_type == TOX_GROUP_MOD_EVENT['USER']:
@@ -649,7 +509,6 @@ def group_moderation(groups_service, contacts_provider, contacts_manager, messen
 def group_password(contacts_provider):
 
     def wrapped(tox_link, group_number, password, length, user_data):
-        LOG_DEBUG(f"group_password #{group_number}")
         password = str(password[:length], 'utf-8')
         group = contacts_provider.get_group_by_number(group_number)
         group.password = password
@@ -660,7 +519,6 @@ def group_password(contacts_provider):
 def group_peer_limit(contacts_provider):
 
     def wrapped(tox_link, group_number, peer_limit, user_data):
-        LOG_DEBUG(f"group_peer_limit #{group_number}")
         group = contacts_provider.get_group_by_number(group_number)
         group.peer_limit = peer_limit
 
@@ -670,7 +528,6 @@ def group_peer_limit(contacts_provider):
 def group_privacy_state(contacts_provider):
 
     def wrapped(tox_link, group_number, privacy_state, user_data):
-        LOG_DEBUG(f"group_privacy_state #{group_number}")
         group = contacts_provider.get_group_by_number(group_number)
         group.is_private = privacy_state == TOX_GROUP_PRIVACY_STATE['PRIVATE']
 
@@ -683,7 +540,7 @@ def group_privacy_state(contacts_provider):
 
 def init_callbacks(tox, profile, settings, plugin_loader, contacts_manager,
                    calls_manager, file_transfer_handler, main_window, tray, messenger, groups_service,
-                   contacts_provider, ms=None):
+                   contacts_provider):
     """
     Initialization of all callbacks.
     :param tox: Tox instance
@@ -700,10 +557,6 @@ def init_callbacks(tox, profile, settings, plugin_loader, contacts_manager,
     :param groups_service: GroupsService instance
     :param contacts_provider: ContactsProvider instance
     """
-    global LOG
-    import logging
-    LOG = logging.getLogger('app.'+__name__)
-
     # self callbacks
     tox.callback_self_connection_status(self_connection_status(tox, profile))
 

toxygen/middleware/threads.py

@@ -1,40 +1,10 @@
-# -*- mode: python; indent-tabs-mode: nil; py-indent-offset: 4; coding: utf-8 -*-
-import sys
+from bootstrap.bootstrap import *
 import threading
 import queue
+from utils import util
+import time
 from PyQt5 import QtCore
 
-from bootstrap.bootstrap import *
-from bootstrap.bootstrap import download_nodes_list
-import tests.support_testing as ts
-from utils import util
-
-if 'QtCore' in sys.modules:
-    def qt_sleep(fSec):
-        if fSec > .001:
-            QtCore.QThread.msleep(int(fSec*1000.0))
-        QtCore.QCoreApplication.processEvents()
-    sleep = qt_sleep
-elif 'gevent' in sys.modules:
-    import gevent
-    sleep = gevent.sleep
-else:
-    import time
-    sleep = time.sleep
-import time
-sleep = time.sleep
-
-# LOG=util.log
-global LOG
-import logging
-LOG = logging.getLogger('app.'+'threads')
-# log = lambda x: LOG.info(x)
-
-def LOG_ERROR(l): print('ERRORt: '+l)
-def LOG_WARN(l): print('WARNt: '+l)
-def LOG_INFO(l): print('INFOt: '+l)
-def LOG_DEBUG(l): print('DEBUGt: '+l)
-def LOG_TRACE(l): pass # print('TRACE+ '+l)
 
 # -----------------------------------------------------------------------------------------------------------------
 # Base threads
@@ -42,45 +12,25 @@ def LOG_TRACE(l): pass # print('TRACE+ '+l)
 
 class BaseThread(threading.Thread):
 
-    def __init__(self, name=None, target=None):
+    def __init__(self):
+        super().__init__()
         self._stop_thread = False
-        if name:
-            super().__init__(name=name, target=target)
-        else:
-            super().__init__(target=target)
 
-    def stop_thread(self, timeout=-1):
+    def stop_thread(self):
         self._stop_thread = True
-        if timeout < 0:
-            timeout = ts.iTHREAD_TIMEOUT
-        i = 0
-        while i < ts.iTHREAD_JOINS:
-            self.join(timeout)
-            if not self.is_alive(): break
-            i = i + 1
-        else:
-            LOG_WARN(f"BaseThread {self.name} BLOCKED")
+        self.join()
+
 
 class BaseQThread(QtCore.QThread):
 
-    def __init__(self, name=None):
-        # NO name=name
+    def __init__(self):
         super().__init__()
         self._stop_thread = False
-        self.name = str(id(self))
 
-    def stop_thread(self, timeout=-1):
+    def stop_thread(self):
         self._stop_thread = True
-        if timeout < 0:
-            timeout = ts.iTHREAD_TIMEOUT
-        i = 0
-        while i < ts.iTHREAD_JOINS:
-            self.wait(timeout)
-            if not self.isRunning(): break
-            i = i + 1
-            sleep(ts.iTHREAD_TIMEOUT)
-        else:
-            LOG_WARN(f"BaseQThread {self.name} BLOCKED")
+        self.wait()
+
 
 # -----------------------------------------------------------------------------------------------------------------
 # Toxcore threads
@@ -88,51 +38,45 @@ class BaseQThread(QtCore.QThread):
 
 class InitThread(BaseThread):
 
-    def __init__(self, tox, plugin_loader, settings, app, is_first_start):
-        super().__init__(name='InitThread')
-        self._tox = tox
-        self._plugin_loader = plugin_loader
-        self._settings = settings
-        self._app = app
+    def __init__(self, tox, plugin_loader, settings, is_first_start):
+        super().__init__()
+        self._tox, self._plugin_loader, self._settings = tox, plugin_loader, settings
         self._is_first_start = is_first_start
 
     def run(self):
-        LOG_DEBUG('InitThread run: ')
-        try:
-            if self._is_first_start:
-                if self._settings['download_nodes_list']:
-                    LOG_INFO('downloading list of nodes')
-                    download_nodes_list(self._settings, oArgs=self._app._args)
+        if self._is_first_start:
+            # download list of nodes if needed
+            download_nodes_list(self._settings)
+            # start plugins
+            self._plugin_loader.load()
 
-            if False:
-                lNodes = ts.generate_nodes()
-                LOG_INFO(f"bootstrapping {len(lNodes)!s} nodes")
-                for data in lNodes:
+        # bootstrap
+        try:
+            for data in generate_nodes():
+                if self._stop_thread:
+                    return
+                self._tox.bootstrap(*data)
+                self._tox.add_tcp_relay(*data)
+        except:
+            pass
+
+        for _ in range(10):
+            if self._stop_thread:
+                return
+            time.sleep(1)
+
+        while not self._tox.self_get_connection_status():
+            try:
+                for data in generate_nodes(None):
                     if self._stop_thread:
                         return
                     self._tox.bootstrap(*data)
                     self._tox.add_tcp_relay(*data)
-            else:
-                LOG_INFO(f"calling test_net nodes")
-                threading.Timer(1.0,
-                                self._app.test_net,
-                                args=list(),
-                                kwargs=dict(lElts=None, oThread=self, iMax=2)
-                                ).start()
+            except:
+                pass
+            finally:
+                time.sleep(5)
 
-            if self._is_first_start:
-                LOG_INFO('starting plugins')
-                self._plugin_loader.load()
-                
-        except Exception as e:
-            LOG_DEBUG(f"InitThread run: ERROR {e}")
-            pass
-
-        for _ in range(ts.iTHREAD_JOINS):
-            if self._stop_thread:
-                return
-            sleep(ts.iTHREAD_SLEEP)
-        return
 
 class ToxIterateThread(BaseQThread):
 
@@ -141,27 +85,21 @@ class ToxIterateThread(BaseQThread):
         self._tox = tox
 
     def run(self):
-        LOG_DEBUG('ToxIterateThread run: ')
         while not self._stop_thread:
-            try:
-                iMsec = self._tox.iteration_interval()
-                self._tox.iterate()
-            except Exception as e:
-                # Fatal Python error: Segmentation fault
-                LOG_ERROR('ToxIterateThread run: {e}')               
-            sleep(iMsec / 1000)
+            self._tox.iterate()
+            time.sleep(self._tox.iteration_interval() / 1000)
 
 
 class ToxAVIterateThread(BaseQThread):
+
     def __init__(self, toxav):
         super().__init__()
         self._toxav = toxav
 
     def run(self):
-        LOG_DEBUG('ToxAVIterateThread run: ')
         while not self._stop_thread:
             self._toxav.iterate()
-            sleep(self._toxav.iteration_interval() / 1000)
+            time.sleep(self._toxav.iteration_interval() / 1000)
 
 
 # -----------------------------------------------------------------------------------------------------------------
@@ -171,7 +109,7 @@ class ToxAVIterateThread(BaseQThread):
 class FileTransfersThread(BaseQThread):
 
     def __init__(self):
-        super().__init__('FileTransfers')
+        super().__init__()
         self._queue = queue.Queue()
         self._timeout = 0.01
 
@@ -186,12 +124,14 @@ class FileTransfersThread(BaseQThread):
             except queue.Empty:
                 pass
             except queue.Full:
-                LOG_WARN('Queue is full in _thread')
+                util.log('Queue is full in _thread')
             except Exception as ex:
-                LOG_ERROR('in _thread: ' + str(ex))
+                util.log('Exception in _thread: ' + str(ex))
 
 
 _thread = FileTransfersThread()
+
+
 def start_file_transfer_thread():
     _thread.start()
 

toxygen/middleware/tox_factory.py

@@ -1,102 +1,34 @@
-# -*- mode: python; indent-tabs-mode: nil; py-indent-offset: 4; coding: utf-8 -*-
 import user_data.settings
 import wrapper.tox
 import wrapper.toxcore_enums_and_consts as enums
 import ctypes
-import traceback
-import os
 
-global LOG
-import logging
-LOG = logging.getLogger('app.'+'tox_factory')
-def LOG_DEBUG(l): print('DEBUGf: '+l)
-def LOG_LOG(l): print('TRACf: '+l)
 
-from ctypes import *
-from utils import util
-from utils import ui as util_ui
-
-def tox_log_cb(iTox, level, file, line, func, message, *args):
-    """
-    * @param level The severity of the log message.
-    * @param file The source file from which the message originated.
-    * @param line The source line from which the message originated.
-    * @param func The function from which the message originated.
-    * @param message The log message.
-    * @param user_data The user data pointer passed to tox_new in options.
-    """
-    file = str(file, 'UTF-8')
-    func = str(func, 'UTF-8')
-    message = str(message, 'UTF-8')
-    if file == 'network.c' and line == 660: return
-    # root WARNING 3network.c#944:b'send_packet'attempted to send message with network family 10 (probably IPv6) on IPv4 socket
-    if file == 'network.c' and line == 944: return
-    message = f"{file}#{line}:{func} {message}"
-    LOG_LOG(# 'TRAC: ' +
-            message)
-
-def tox_factory(data=None, settings=None, args=None, app=None):
+def tox_factory(data=None, settings=None):
     """
     :param data: user data from .tox file. None = no saved data, create new profile
     :param settings: current profile settings. None = default settings will be used
     :return: new tox instance
     """
-    if not settings:
-        LOG.warn("tox_factory using get_default_settings")
+    if settings is None:
         settings = user_data.settings.Settings.get_default_settings()
-    else:
-        user_data.settings.clean_settings(settings)
 
-    try:
-        tox_options = wrapper.tox.Tox.options_new()
-        tox_options.contents.ipv6_enabled = settings['ipv6_enabled']
-        tox_options.contents.udp_enabled = settings['udp_enabled']
-        tox_options.contents.proxy_type = int(settings['proxy_type'])
-        if type(settings['proxy_host']) == str:
-            tox_options.contents.proxy_host = bytes(settings['proxy_host'],'UTF-8')
-        elif type(settings['proxy_host']) == bytes:
-            tox_options.contents.proxy_host = settings['proxy_host']
-        else:
-            tox_options.contents.proxy_host = b''
-        tox_options.contents.proxy_port = int(settings['proxy_port'])
-        tox_options.contents.start_port = settings['start_port']
-        tox_options.contents.end_port = settings['end_port']
-        tox_options.contents.tcp_port = settings['tcp_port']
-        tox_options.contents.local_discovery_enabled = settings['local_discovery_enabled']
-        tox_options.contents.dht_announcements_enabled = settings['dht_announcements_enabled']
-        tox_options.contents.hole_punching_enabled = settings['hole_punching_enabled']
-        if data:  # load existing profile
-            tox_options.contents.savedata_type = enums.TOX_SAVEDATA_TYPE['TOX_SAVE']
-            tox_options.contents.savedata_data = ctypes.c_char_p(data)
-            tox_options.contents.savedata_length = len(data)
-        else:  # create new profile
-            tox_options.contents.savedata_type = enums.TOX_SAVEDATA_TYPE['NONE']
-            tox_options.contents.savedata_data = None
-            tox_options.contents.savedata_length = 0
+    tox_options = wrapper.tox.Tox.options_new()
+    tox_options.contents.udp_enabled = settings['udp_enabled']
+    tox_options.contents.proxy_type = settings['proxy_type']
+    tox_options.contents.proxy_host = bytes(settings['proxy_host'], 'UTF-8')
+    tox_options.contents.proxy_port = settings['proxy_port']
+    tox_options.contents.start_port = settings['start_port']
+    tox_options.contents.end_port = settings['end_port']
+    tox_options.contents.tcp_port = settings['tcp_port']
+    tox_options.contents.local_discovery_enabled = settings['lan_discovery']
+    if data:  # load existing profile
+        tox_options.contents.savedata_type = enums.TOX_SAVEDATA_TYPE['TOX_SAVE']
+        tox_options.contents.savedata_data = ctypes.c_char_p(data)
+        tox_options.contents.savedata_length = len(data)
+    else:  # create new profile
+        tox_options.contents.savedata_type = enums.TOX_SAVEDATA_TYPE['NONE']
+        tox_options.contents.savedata_data = None
+        tox_options.contents.savedata_length = 0
 
-        # overrides
-        tox_options.contents.local_discovery_enabled = False
-        tox_options.contents.ipv6_enabled = False
-        tox_options.contents.hole_punching_enabled = False
-
-        LOG.debug("wrapper.tox.Tox settings: " +repr(settings))
-
-        if tox_options._options_pointer:
-            c_callback = CFUNCTYPE(None, c_void_p, c_int, c_char_p, c_int, c_char_p, c_char_p, c_void_p)
-            tox_options.self_logger_cb = c_callback(tox_log_cb)
-            wrapper.tox.Tox.libtoxcore.tox_options_set_log_callback(
-                tox_options._options_pointer,
-                tox_options.self_logger_cb)
-        else:
-            logging.warn("No tox_options._options_pointer to add self_logger_cb" )
-
-        retval = wrapper.tox.Tox(tox_options)
-    except Exception as e:
-        if app and hasattr(app, '_log'):
-            app._log(f"ERROR: wrapper.tox.Tox failed:  {e}")
-            LOG.warn(traceback.format_exc())
-        raise
-
-    if app and hasattr(app, '_log'):
-        app._log("DEBUG: wrapper.tox.Tox succeeded")
-    return retval
+    return wrapper.tox.Tox(tox_options)

toxygen/network/tox_dns.py

@@ -1,40 +1,20 @@
-# -*- mode: python; indent-tabs-mode: nil; py-indent-offset: 4; coding: utf-8 -*-
 import json
 import urllib.request
 import utils.util as util
 from PyQt5 import QtNetwork, QtCore
-try:
-    import requests
-except ImportError:
-    requests = None
 
-global LOG
-import logging
-LOG = logging.getLogger('app.'+__name__)
 
 class ToxDns:
 
-    def __init__(self, settings, log=None):
+    def __init__(self, settings):
         self._settings = settings
-        self._log = log
 
     @staticmethod
     def _send_request(url, data):
-        if requests:
-            LOG.info('send_request loading with requests: ' + str(url))
-            headers = dict()
-            headers['Content-Type'] = 'application/json'
-            req = requests.get(url, headers=headers)
-            if req.status_code < 300:
-                retval = req.content
-            else:
-                raise LookupError(str(req.status_code))
-        else:
-            req = urllib.request.Request(url)
-            req.add_header('Content-Type', 'application/json')
-            response = urllib.request.urlopen(req, bytes(json.dumps(data), 'utf-8'))
-            retval = response.read()
-        res = json.loads(str(retval, 'utf-8'))
+        req = urllib.request.Request(url)
+        req.add_header('Content-Type', 'application/json')
+        response = urllib.request.urlopen(req, bytes(json.dumps(data), 'utf-8'))
+        res = json.loads(str(response.read(), 'utf-8'))
         if not res['c']:
             return res['tox_id']
         else:
@@ -49,25 +29,12 @@ class ToxDns:
         site = email.split('@')[1]
         data = {"action": 3, "name": "{}".format(email)}
         urls = ('https://{}/api'.format(site), 'http://{}/api'.format(site))
-        if requests:
-            for url in urls:
-                LOG.info('TOX nodes loading with requests: ' + str(url))
-                try:
-                    headers = dict()
-                    headers['Content-Type'] = 'application/json'
-                    req = requests.get(url, headers=headers)
-                    if req.status_code < 300:
-                        result = req.content
-                        return result
-                except Exception as ex:
-                    LOG.error('ERROR: TOX DNS loading error with requests: ' + str(ex))
-
-        elif not self._settings['proxy_type']:  # no proxy
+        if not self._settings['proxy_type']:  # no proxy
             for url in urls:
                 try:
                     return self._send_request(url, data)
                 except Exception as ex:
-                    LOG.error('ERROR: TOX DNS ' + str(ex))
+                    util.log('TOX DNS ERROR: ' + str(ex))
         else:  # proxy
             netman = QtNetwork.QNetworkAccessManager()
             proxy = QtNetwork.QNetworkProxy()
@@ -93,6 +60,6 @@ class ToxDns:
                     if not result['c']:
                         return result['tox_id']
                 except Exception as ex:
-                    LOG.error('ERROR: TOX DNS ' + str(ex))
+                    util.log('TOX DNS ERROR: ' + str(ex))
 
         return None  # error

toxygen/notifications/sound.py

@@ -3,9 +3,6 @@ import wave
 import pyaudio
 import os.path
 
-global LOG
-import logging
-LOG = logging.getLogger('app.'+__name__)
 
 SOUND_NOTIFICATION = {
     'MESSAGE': 0,
@@ -28,19 +25,9 @@ class AudioFile:
 
     def play(self):
         data = self.wf.readframes(self.chunk)
-        try:
-            while data:
-                self.stream.write(data)
-                data = self.wf.readframes(self.chunk)
-        except Exception as e:
-            LOG.error(f"Error during AudioFile play {e!s}")
-            LOG.debug("Error during AudioFile play " \
-                      +' rate=' +str(self.wf.getframerate()) \
-                      + 'format=' +str(self.p.get_format_from_width(self.wf.getsampwidth())) \
-                      +' channels=' +str(self.wf.getnchannels()) \
-                      )
-
-            raise
+        while data:
+            self.stream.write(data)
+            data = self.wf.readframes(self.chunk)
 
     def close(self):
         self.stream.close()

toxygen/plugin_support/plugin_support.py

@@ -1,4 +1,3 @@
-# -*- mode: python; indent-tabs-mode: nil; py-indent-offset: 4; coding: utf-8 -*-
 import utils.util as util
 import os
 import importlib
@@ -6,14 +5,6 @@ import inspect
 import plugins.plugin_super_class as pl
 import sys
 
-# LOG=util.log
-global LOG
-import logging
-LOG = logging.getLogger('plugin_support')
-def trace(msg, *args, **kwargs): LOG._log(0, msg, [])
-LOG.trace = trace
-
-log = lambda x: LOG.info(x)
 
 class Plugin:
 
@@ -55,49 +46,38 @@ class PluginLoader:
         """
         path = util.get_plugins_directory()
         if not os.path.exists(path):
-            self._app._LOG('WARN: Plugin directory not found: ' + path)
+            util.log('Plugin dir not found')
             return
-
-        sys.path.append(path)
+        else:
+            sys.path.append(path)
         files = [f for f in os.listdir(path) if os.path.isfile(os.path.join(path, f))]
         for fl in files:
             if fl in ('plugin_super_class.py', '__init__.py') or not fl.endswith('.py'):
                 continue
-            base_name = fl[:-3]  # module name without .py
+            name = fl[:-3]  # module name without .py
             try:
-                module = importlib.import_module(base_name)  # import plugin
-                LOG.trace('Imported module: ' +base_name +' file: ' +fl)
-            except ImportError as e:
-                LOG.warn(f"Import error:  {e}" +' file: ' +fl)
+                module = importlib.import_module(name)  # import plugin
+            except ImportError:
+                util.log('Import error in module ' + name)
                 continue
             except Exception as ex:
-                LOG.error('importing ' + base_name + ' Exception: ' + str(ex))
+                util.log('Exception in module ' + name + ' Exception: ' + str(ex))
                 continue
             for elem in dir(module):
                 obj = getattr(module, elem)
                 # looking for plugin class in module
                 if not inspect.isclass(obj) or not hasattr(obj, 'is_plugin') or not obj.is_plugin:
                     continue
+                print('Plugin', elem)
                 try:  # create instance of plugin class
-                    instance = obj(self._app) # name, short_name, app
-                    # needed by bday...
-                    instance._profile=self._app._ms._profile
-                    instance._settings=self._settings
-                    short_name = instance.get_short_name()
-                    is_active = short_name in self._settings['plugins']
+                    instance = obj(self._app)
+                    is_active = instance.get_short_name() in self._settings['plugins']
                     if is_active:
-                        try:
-                            instance.start()
-                            self._app.LOG('INFO: Started Plugin ' +short_name)
-                        except Exception as e:
-                            self._app.LOG.error(f"Starting Plugin ' +short_name +'  {e}")
-                    # else: LOG.info('Defined Plugin ' +short_name)
+                        instance.start()
                 except Exception as ex:
-                    LOG.error('in module ' + short_name + ' Exception: ' + str(ex))
+                    util.log('Exception in module ' + name + ' Exception: ' + str(ex))
                     continue
-                short_name = instance.get_short_name()
-                self._plugins[short_name] = Plugin(instance, is_active)
-                LOG.info('Added plugin: ' +short_name +' from file: ' +fl)
+                self._plugins[instance.get_short_name()] = Plugin(instance, is_active)
                 break
 
     def callback_lossless(self, friend_number, data):
@@ -134,7 +114,7 @@ class PluginLoader:
         for plugin in self._plugins.values():
             try:
                 result.append([plugin.instance.get_name(),  # plugin full name
-                               plugin.is_active,            # is enabled
+                               plugin.is_active,  # is enabled
                                plugin.instance.get_description(),  # plugin description
                                plugin.instance.get_short_name()])  # key - short unique name
             except:
@@ -146,13 +126,7 @@ class PluginLoader:
         """
         Return window or None for specified plugin
         """
-        try:
-            if key in self._plugins and hasattr(self._plugins[key], 'instance'):
-                return self._plugins[key].instance.get_window()
-        except Exception as e:
-            self._app.LOG('WARN: ' +key +' _plugins no slot instance: ' +str(e))
-
-        return None
+        return self._plugins[key].instance.get_window()
 
     def toggle_plugin(self, key):
         """
@@ -188,7 +162,6 @@ class PluginLoader:
         for plugin in self._plugins.values():
             if not plugin.is_active:
                 continue
-
             try:
                 result.extend(plugin.instance.get_menu(num))
             except:
@@ -200,10 +173,6 @@ class PluginLoader:
         for plugin in self._plugins.values():
             if not plugin.is_active:
                 continue
-            if not hasattr(plugin.instance, 'get_message_menu'):
-                name = plugin.instance.get_short_name()
-                self._app.LOG('WARN: get_message_menu not found: ' + name)
-                continue
             try:
                 result.extend(plugin.instance.get_message_menu(menu, selected_text))
             except:
@@ -220,11 +189,6 @@ class PluginLoader:
             del self._plugins[key]
 
     def reload(self):
-        path = util.get_plugins_directory()
-        if not os.path.exists(path):
-            self._app.LOG('WARN: Plugin directory not found: ' + path)
-            return
-
+        print('Reloading plugins')
         self.stop()
-        self._app.LOG('INFO: Reloading plugins from ' +path)
         self.load()