QThread

.gitignore

@@ -2,7 +2,6 @@
 .pylint.out
 *.pyc
 *.pyo
-*.bak
 
 toxygen/toxcore
 tests/tests

requirements.txt

@@ -4,6 +4,9 @@
 # usually this is installed by your OS package manager and pip may not
 # detect the right version, so we leave these commented
 # PyQt5 >= 5.15.10
+# this is not on pypi yet but is required - get it from
+# https://git.plastiras.org/emdee/toxygen_wrapper
+# toxygen_wrapper == 1.0.0
 QtPy >= 2.4.1
 PyAudio >= 0.2.13
 numpy >= 1.26.1
@@ -17,6 +20,7 @@ sounddevice >= 0.3.15
 coloredlogs >= 15.0.1
 # this is optional
 # qtconsole >= 5.4.3
-# this is not on pypi yet - get it from
-# https://git.plastiras.org/emdee/toxygen_wrapper
-# toxygen_wrapper == 1.0.0
+# this is not on pypi yet but is optional for qweechat - get it from
+# https://git.plastiras.org/emdee/qweechat
+# qweechat_wrapper == 0.0.1
+

toxygen/__init__.py

@@ -1,9 +1,3 @@
 import os
 import sys
 
-path = os.path.dirname(os.path.realpath(__file__))  # curr dir
-
-sys.path.insert(0, os.path.join(path, 'styles'))
-sys.path.insert(0, os.path.join(path, 'plugins'))
-sys.path.insert(0, os.path.join(path, 'third_party'))
-sys.path.insert(0, path)

toxygen/__main__.py

@@ -37,6 +37,12 @@ with ts.ignoreStderr():
 __maintainer__ = 'Ingvar'
 __version__ = '1.0.0' # was 0.5.0+
 
+path = os.path.dirname(os.path.realpath(__file__))  # curr dir
+sys.path.insert(0, os.path.join(path, 'styles'))
+sys.path.insert(0, os.path.join(path, 'plugins'))
+sys.path.insert(0, os.path.join(path, 'third_party'))
+sys.path.insert(0, path)
+
 sleep = time.sleep
 
 os.environ['QT_API'] = os.environ.get('QT_API', 'pyqt5')

toxygen/app.py

@@ -839,14 +839,15 @@ class App:
 
     def loop(self, n) -> None:
         """
-        Im guessings - there are 3 sleeps - time, tox, and Qt
+        Im guessing - there are 4 sleeps - time, tox, and Qt gevent
         """
         interval = self._tox.iteration_interval()
         for i in range(n):
             self._tox.iterate()
             QtCore.QThread.msleep(interval)
-            # NO QtCore.QCoreApplication.processEvents()
-            sleep(interval / 1000.0)
+            # NO?
+            QtCore.QCoreApplication.processEvents()
+            # sleep(interval / 1000.0)
 
     def _test_tox(self) -> None:
         self.test_net(iMax=8)
@@ -918,7 +919,6 @@ class App:
                 LOG.info(f"Connected # {i}" +' : ' +repr(status))
                 break
             LOG.trace(f"Connected status #{i}: {status}")
-            self.loop(2)
 
     def _test_env(self) -> None:
         _settings = self._settings

toxygen/av/calls.py

@@ -16,7 +16,7 @@ import common.tox_save
 from utils import ui as util_ui
 import toxygen_wrapper.tests.support_testing as ts
 from middleware.threads import invoke_in_main_thread
-from middleware.threads import BaseThread
+from middleware.threads import BaseThread, BaseQThread
 
 sleep = time.sleep
 
@@ -25,9 +25,42 @@ import logging
 LOG = logging.getLogger('app.'+__name__)
 
 TIMER_TIMEOUT = 30.0
-bSTREAM_CALLBACK = False
 iFPS = 25
 
+class AudioThread(BaseQThread):
+    def __init__(self, av, name=''):
+        super().__init__()
+        self.av = av
+        self._name = name
+
+    def join(self, ito=ts.iTHREAD_TIMEOUT):
+        LOG_DEBUG(f"AudioThread join {self}")
+        # dunno
+
+    def run(self):
+        LOG_DEBUG('AudioThread run: ')
+        # maybe not needed
+        while not self._stop_thread:
+            self.av.send_audio()
+            sleep(100.0 / 1000.0)
+
+class VideoThread(BaseQThread):
+    def __init__(self, av, name=''):
+        super().__init__()
+        self.av = av
+        self._name = name
+
+    def join(self, ito=ts.iTHREAD_TIMEOUT):
+        LOG_DEBUG(f"VideoThread join {self}")
+        # dunno
+
+    def run(self):
+        LOG_DEBUG('VideoThread run: ')
+        # maybe not needed
+        while not self._stop_thread:
+            self.av.send_video()
+            sleep(100.0 / 1000.0)
+
 class AV(common.tox_save.ToxAvSave):
 
     def __init__(self, toxav, settings):
@@ -71,10 +104,9 @@ class AV(common.tox_save.ToxAvSave):
         # was iOutput = self._settings._args.audio['output']
         iInput = self._settings['audio']['input']
         self.lPaSampleratesI = ts.lSdSamplerates(iInput)
-        if not self.lPaSampleratesI: LOG.warn(f"empty self.lPaSampleratesI iInput={iInput}")
         iOutput = self._settings['audio']['output']
         self.lPaSampleratesO = ts.lSdSamplerates(iOutput)
-        if not self.lPaSampleratesO: LOG.warn(f"empty self.lPaSampleratesO iOutput={iOutput}")
+
         global oPYA
         oPYA = self._audio = pyaudio.PyAudio()
 
@@ -113,8 +145,9 @@ class AV(common.tox_save.ToxAvSave):
         return self.call_accept_call(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}")
+        # called from CM.accept_call in a try:
+        LOG.debug(f"call_accept_call from F={friend_number} R={self._running}" +
+                  f" A={audio_enabled} V={video_enabled}")
         # import pdb; pdb.set_trace() - gets into q Qt exec_ problem
         # ts.trepan_handler()
 
@@ -129,19 +162,18 @@ class AV(common.tox_save.ToxAvSave):
                                    self._audio_krate_tox_audio if audio_enabled else 0,
                                    self._audio_krate_tox_video if video_enabled else 0)
             except Exception as e:
-                LOG.debug(f"AV accept_call error from {friend_number} {self._running} {e}")
+                LOG.error(f"AV accept_call error from {friend_number} {self._running} {e}")
                 raise
-            if audio_enabled:
-                # may raise
-                self.start_audio_thread()
             if video_enabled:
                 # may raise
                 self.start_video_thread()
+            if audio_enabled:
+                LOG.debug(f"calls accept_call calling start_audio_thread F={friend_number}")
+                # may raise
+                self.start_audio_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:
@@ -155,6 +187,10 @@ class AV(common.tox_save.ToxAvSave):
             # dunno
             self.stop_audio_thread()
             self.stop_video_thread()
+        if not by_friend:
+            LOG.debug(f"finish_call before call_control {friend_number}")
+            self._toxav.call_control(friend_number, TOXAV_CALL_CONTROL['CANCEL'])
+            LOG.debug(f"finish_call after call_control {friend_number}")
 
     def finish_not_started_call(self, friend_number):
         if friend_number in self:
@@ -184,11 +220,12 @@ class AV(common.tox_save.ToxAvSave):
 
     # Threads
 
-    def start_audio_thread(self):
+    def start_audio_thread(self, bSTREAM_CALLBACK=False):
         """
         Start audio sending
         from a callback
         """
+        # called from call_accept_call in an try: from CM.accept_call
         global oPYA
         # was iInput = self._settings._args.audio['input']
         iInput = self._settings['audio']['input']
@@ -199,7 +236,7 @@ class AV(common.tox_save.ToxAvSave):
         lPaSamplerates =  ts.lSdSamplerates(iInput)
         if not(len(lPaSamplerates)):
             e = f"No sample rates for device: audio[input]={iInput}"
-            LOG_ERROR(f"start_audio_thread {e}")
+            LOG_WARN(f"start_audio_thread {e}")
             #?? dunno - cancel call? - no let the user do it
             # return
             # just guessing  here in case that's a false negative
@@ -207,26 +244,28 @@ class AV(common.tox_save.ToxAvSave):
         if lPaSamplerates and self._audio_rate_pa in lPaSamplerates:
             pass
         elif lPaSamplerates:
-            LOG_WARN(f"{self._audio_rate_pa} not in {lPaSamplerates}")
-            self._audio_rate_pa = lPaSamplerates[0]
             LOG_WARN(f"Setting audio_rate to: {lPaSamplerates[0]}")
+            self._audio_rate_pa = lPaSamplerates[0]
         elif 'defaultSampleRate' in oPYA.get_device_info_by_index(iInput):
             self._audio_rate_pa = oPYA.get_device_info_by_index(iInput)['defaultSampleRate']
+            LOG_WARN(f"setting to defaultSampleRate")
         else:
             LOG_WARN(f"{self._audio_rate_pa} not in {lPaSamplerates}")
         # a float is in here - must it be int?
         if type(self._audio_rate_pa) == float:
             self._audio_rate_pa = round(self._audio_rate_pa)
         try:
-            LOG_DEBUG( f"start_audio_thread framerate: {self._audio_rate_pa}" \
-                     +f" device: {iInput}"
-                     +f" supported: {lPaSamplerates}")
             if self._audio_rate_pa not in lPaSamplerates:
                 LOG_WARN(f"PAudio sampling rate was {self._audio_rate_pa} changed to {lPaSamplerates[0]}")
                 LOG_DEBUG(f"lPaSamplerates={lPaSamplerates}")
                 self._audio_rate_pa = lPaSamplerates[0]
+            else:
+                LOG_DEBUG( f"start_audio_thread framerate: {self._audio_rate_pa}" \
+                        +f" device: {iInput}"
+                        +f" supported: {lPaSamplerates}")
 
             if bSTREAM_CALLBACK:
+                # why would you not call a thread?
                 self._audio_stream = oPYA.open(format=pyaudio.paInt16,
                                                rate=self._audio_rate_pa,
                                                channels=self._audio_channels,
@@ -240,8 +279,8 @@ class AV(common.tox_save.ToxAvSave):
                     sleep(0.1)
                 self._audio_stream.stop_stream()
                 self._audio_stream.close()
-
             else:
+                LOG_DEBUG( f"start_audio_thread starting thread {self._audio_rate_pa}")
                 self._audio_stream = oPYA.open(format=pyaudio.paInt16,
                                                rate=self._audio_rate_pa,
                                                channels=self._audio_channels,
@@ -249,21 +288,24 @@ class AV(common.tox_save.ToxAvSave):
                                                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,
+                self._audio_thread = AudioThread(self,
                                                 name='_audio_thread')
                 self._audio_thread.start()
+                LOG_DEBUG( f"start_audio_thread started thread name='_audio_thread'")
 
         except Exception as e:
-            LOG.error(f"Starting self._audio.open {e}")
-            LOG.debug(repr(dict(format=pyaudio.paInt16,
+            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? not if from a callback
+            # catcher in place in calls_manager? yes accept_call
             # calls_manager._call.toxav_call_state_cb(friend_number, mask)
-            # raise RuntimeError(e)
+            invoke_in_main_thread(util_ui.message_box,
+                                  str(e),
+                                  util_ui.tr("Starting self._audio.open"))
             return
         else:
             LOG_DEBUG(f"start_audio_thread {self._audio_stream}")
@@ -274,6 +316,7 @@ class AV(common.tox_save.ToxAvSave):
         if self._audio_thread is None:
             return
         self._audio_running = False
+        self._audio_thread._stop_thread = True
 
         self._audio_thread = None
         self._audio_stream = None
@@ -306,8 +349,7 @@ class AV(common.tox_save.ToxAvSave):
                                                         s['video']['width'],
                                                         s['video']['height'])
         else:
-            with ts.ignoreStdout():
-                import cv2
+            with ts.ignoreStdout(): import cv2
             if s['video']['device'] == 0:
                 # webcam
                 self._video = cv2.VideoCapture(s['video']['device'], cv2.DSHOW)
@@ -327,7 +369,7 @@ class AV(common.tox_save.ToxAvSave):
                  +f" supported: {s['video']['width']} {s['video']['height']}")
 
         self._video_running = True
-        self._video_thread = BaseThread(target=self.send_video,
+        self._video_thread = VideoThread(self,
                                         name='_video_thread')
         self._video_thread.start()
 
@@ -336,6 +378,7 @@ class AV(common.tox_save.ToxAvSave):
         if self._video_thread is None:
             return
 
+        self._video_thread._stop_thread = True
         self._video_running = False
         i = 0
         while i < ts.iTHREAD_JOINS:
@@ -349,31 +392,31 @@ class AV(common.tox_save.ToxAvSave):
             LOG.warn("self._video_thread.is_alive BLOCKED")
         self._video_thread = None
         self._video = None
-
     # Incoming chunks
 
     def audio_chunk(self, samples, channels_count, rate) -> None:
         """
         Incoming chunk
         """
-
+        # from callback
         if self._out_stream is None:
             # was iOutput = self._settings._args.audio['output']
             iOutput = self._settings['audio']['output']
             if self.lPaSampleratesO and rate in self.lPaSampleratesO:
-                pass
+                LOG_DEBUG(f"Using rate {rate} in self.lPaSampleratesO")
             elif self.lPaSampleratesO:
-                LOG.warn(f"{rate} not in {self.lPaSampleratesO}")
-                LOG.warn(f"Setting audio_rate to: {self.lPaSampleratesO[0]}")
+                LOG_WARN(f"{rate} not in {self.lPaSampleratesO}")
+                LOG_WARN(f"Setting audio_rate to: {self.lPaSampleratesO[0]}")
                 rate = self.lPaSampleratesO[0]
             elif 'defaultSampleRate' in oPYA.get_device_info_by_index(iOutput):
                 rate = round(oPYA.get_device_info_by_index(iOutput)['defaultSampleRate'])
-                LOG.warn(f"Setting rate to {rate} empty self.lPaSampleratesO")
+                LOG_WARN(f"Setting rate to {rate} empty self.lPaSampleratesO")
             else:
-                LOG.warn(f"Using rate {rate} empty self.lPaSampleratesO")
+                LOG_WARN(f"Using rate {rate} empty self.lPaSampleratesO")
             if type(rate) == float:
                 rate = round(rate)
-
+            # test output device?
+            # [Errno -9985] Device unavailable
             try:
                 with ts.ignoreStderr():
                     self._out_stream = oPYA.open(format=pyaudio.paInt16,
@@ -382,7 +425,7 @@ class AV(common.tox_save.ToxAvSave):
                                                  output_device_index=iOutput,
                                                  output=True)
             except Exception as e:
-                LOG.error(f"Error playing audio_chunk creating self._out_stream   {e}")
+                LOG_ERROR(f"Error playing audio_chunk creating self._out_stream  output_device_index={iOutput} {e}")
                 invoke_in_main_thread(util_ui.message_box,
                                       str(e),
                                       util_ui.tr("Error Chunking audio"))
@@ -391,37 +434,44 @@ class AV(common.tox_save.ToxAvSave):
                 return
 
         iOutput = self._settings['audio']['output']
-#trace        LOG.debug(f"audio_chunk output_device_index={iOutput} rate={rate} channels={channels_count}")
+#trace        LOG_DEBUG(f"audio_chunk output_device_index={iOutput} rate={rate} channels={channels_count}")
+        try:
             self._out_stream.write(samples)
+        except Exception as e:
+            # OSError: [Errno -9999] Unanticipated host error
+            LOG_WARN(f"audio_chunk output_device_index={iOutput} {e}")
 
     # AV sending
 
     def send_audio_data(self, data, count, *largs, **kwargs) -> None:
+        # callback
         pcm = data
         # :param sampling_rate: Audio sampling rate used in this frame.
+        try:
             if self._toxav is None:
-            raise RuntimeError("_toxav not initialized")
+                LOG_ERROR("_toxav not initialized")
+                return
             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]}")
+                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 audio_send_frame: This client is currently not in a call with the friend.
                     self._toxav.audio_send_frame(friend_num,
                                                  pcm,
                                                  count,
                                                  self._audio_channels,
                                                  self._audio_rate_tox)
+ts)
         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"))
-                   # raise #? stop ? endcall?
+           LOG.error(f"Error send_audio_data audio_send_frame: {e}")
+           LOG.debug(f"send_audio_data self._audio_rate_tox={self._audio_rate_tox} self._audio_channels={self._audio_channels}")
            self.stop_audio_thread()
+           invoke_in_main_thread(util_ui.message_box,
+                            str(e),
+                            util_ui.tr("Error send_audio_data audio_send_frame"))
+           #? stop ? endcall?
 
     def send_audio(self) -> None:
         """
@@ -429,7 +479,7 @@ class AV(common.tox_save.ToxAvSave):
         """
         i=0
         count = self._audio_sample_count_tox
-        LOG.debug(f"send_audio stream={self._audio_stream}")
+        LOG_DEBUG(f"send_audio stream={self._audio_stream}")
         while self._audio_running:
             try:
                 pcm = self._audio_stream.read(count, exception_on_overflow=False)
@@ -448,17 +498,17 @@ class AV(common.tox_save.ToxAvSave):
         """
         This method sends video to friends
         """
-        LOG.debug(f"send_video thread={threading.current_thread().name}"
-                  +f" self._video_running={self._video_running}"
-                  +f" device: {self._settings['video']['device']}" )
+#        LOG_DEBUG(f"send_video thread={threading.current_thread().name}"
+#                  +f" self._video_running={self._video_running}"
+#                  +f" device: {self._settings['video']['device']}" )
         while self._video_running:
             try:
                 result, frame = self._video.read()
                 if not result:
-                    LOG.warn(f"send_video video_send_frame _video.read result={result}")
+                    LOG_WARN(f"send_video video_send_frame _video.read result={result}")
                     break
                 if frame is None:
-                    LOG.warn(f"send_video video_send_frame _video.read result={result} frame={frame}")
+                    LOG_WARN(f"send_video video_send_frame _video.read result={result} frame={frame}")
                     continue
                 else:
                     LOG_TRACE(f"send_video video_send_frame _video.read result={result}")
@@ -468,7 +518,7 @@ class AV(common.tox_save.ToxAvSave):
                         if self._calls[friend_num].out_video:
                             friends.append(friend_num)
                     if len(friends) == 0:
-                        LOG.warn(f"send_video video_send_frame no friends")
+                        LOG_WARN(f"send_video video_send_frame no friends")
                     else:
                         LOG_TRACE(f"send_video video_send_frame {friends}")
                         friend_num = friends[0]
@@ -476,11 +526,11 @@ class AV(common.tox_save.ToxAvSave):
                             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}")
+                            LOG_WARN(f"send_video video_send_frame ERROR {e}")
                             pass
 
             except Exception as e:
-                LOG.error(f"send_video video_send_frame {e}")
+                LOG_ERROR(f"send_video video_send_frame {e}")
                 pass
 
             sleep( 1.0/iFPS)
@@ -524,11 +574,12 @@ class AV(common.tox_save.ToxAvSave):
         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)
+        # was np.int
+        u = np.zeros((self._video_height // 2, self._video_width // 2), dtype=np.int32)
         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:]
         u = list(itertools.chain.from_iterable(u))
-        v = np.zeros((self._video_height // 2, self._video_width // 2), dtype=np.int)
+        v = np.zeros((self._video_height // 2, self._video_width // 2), dtype=np.int32)
         v[::2, :] = frame[self._video_height * 5 // 4:, :self._video_width // 2]
         v[1::2, :] = frame[self._video_height * 5 // 4:, self._video_width // 2:]
         v = list(itertools.chain.from_iterable(v))

toxygen/av/calls_manager.py

@@ -3,6 +3,9 @@
 import sys
 import threading
 import traceback
+import logging
+
+from  qtpy import QtCore
 
 import av.calls
 from messenger.messages import *
@@ -11,7 +14,6 @@ import common.event as event
 import utils.ui as util_ui
 
 global LOG
-import logging
 LOG = logging.getLogger('app.'+__name__)
 
 class CallsManager:
@@ -63,7 +65,7 @@ class CallsManager:
         """
         Incoming call from friend.
         """
-        LOG.debug(__name__ +f" incoming_call  {friend_number}")
+        LOG.debug(f"CM incoming_call  {friend_number}")
         # 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)
@@ -83,11 +85,17 @@ class CallsManager:
         Called from a thread
         """
 
-        LOG.debug(f"CM accept_call from {friend_number} {audio} {video}")
+        LOG.debug(f"CM accept_call from friend_number={friend_number} {audio} {video}")
         sys.stdout.flush()
 
         try:
+            self._main_screen.active_call()
+            # failsafe added somewhere this was being left up
+            self.close_call(friend_number)
+            QtCore.QCoreApplication.processEvents()
+
             self._callav.call_accept_call(friend_number, audio, video)
+            LOG.debug(f"accept_call _call.accept_call CALLED f={friend_number}")
         except Exception as e:
             #
             LOG.error(f"accept_call _call.accept_call ERROR for {friend_number} {e}")
@@ -112,46 +120,57 @@ class CallsManager:
                 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)
+            LOG.debug(f"CM.accept_call close av_widget")
+            self.close_call(friend_number)
+            LOG.debug(f" closed self._call_widgets[{friend_number}]")
+
+    def close_call(self, friend_number):
+        # refactored out from above because the accept window not getting
+        # taken down in some accept audio calls
+        LOG.debug(f"close_call {friend_number}")
         try:
+            if friend_number in self._call_widgets:
                 self._call_widgets[friend_number].close()
                 del self._call_widgets[friend_number]
-            except:
+            if friend_number in self._incoming_calls:
+                self._incoming_calls.remove(friend_number)
+        except Exception as e:
             # RuntimeError: wrapped C/C++ object of type IncomingCallWidget has been deleted
 
-                pass
-            LOG.debug(f" closed self._call_widgets[{friend_number}]")
+            LOG.warn(f" closed self._call_widgets[{friend_number}] {e}")
+        # invoke_in_main_thread(QtCore.QCoreApplication.processEvents)
+        QtCore.QCoreApplication.processEvents()
+
 
     def stop_call(self, friend_number, by_friend):
         """
         Stop call with friend
         """
-        LOG.debug(__name__+f" stop_call {friend_number}")
+        LOG.debug(f"CM.stop_call friend={friend_number}")
         if friend_number in self._incoming_calls:
             self._incoming_calls.remove(friend_number)
             is_declined = True
         else:
             is_declined = False
+        if friend_number in self._call_widgets:
+            LOG.debug(f"CM.stop_call _call_widgets close")
+            self.close_call(friend_number)
+
+        LOG.debug(f"CM.stop_call _main_screen.call_finished")
         self._main_screen.call_finished()
         self._callav.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._callav.is_video_call(friend_number)
         if is_video:
-                import cv2
+            def destroy_window():
+                #??? FixMe
+                with ts.ignoreStdout(): import cv2
                 cv2.destroyWindow(str(friend_number))
-
+            LOG.debug(f"CM.stop_call destroy_window")
             threading.Timer(2.0, destroy_window).start()
+
+        LOG.debug(f"CM.stop_call _call_finished_event")
         self._call_finished_event(friend_number, is_declined)
 
     def friend_exit(self, friend_number):

toxygen/file_transfers/file_transfers_handler.py

@@ -93,6 +93,7 @@ class FileTransfersHandler(ToxSave):
         :param file_number: file number
         :param already_cancelled: was cancelled by friend
         """
+        # callback
         if (friend_number, file_number) in self._file_transfers:
             tr = self._file_transfers[(friend_number, file_number)]
             if not already_cancelled:

toxygen/history/database.py

@@ -5,7 +5,7 @@ import utils.util as util
 
 global LOG
 import logging
-LOG = logging.getLogger('app.db')
+LOG = logging.getLogger('h.database')
 
 TIMEOUT = 11
 SAVE_MESSAGES = 500
@@ -86,7 +86,7 @@ class Database:
             db.commit()
             return True
         except Exception as e:
-            LOG.error("dd_friend_to_db " +self._name +' Database exception! ' +str(e))
+            LOG.error("dd_friend_to_db " +self._name +f" Database exception! {e}")
             db.rollback()
             return False
         finally:
@@ -101,7 +101,7 @@ class Database:
             db.commit()
             return True
         except Exception as e:
-            LOG.error("delete_friend_from_db " +self._name +' Database exception! ' +str(e))
+            LOG.error("delete_friend_from_db " +self._name +f" Database exception! {e}")
             db.rollback()
             return False
         finally:
@@ -118,7 +118,7 @@ class Database:
             db.commit()
             return True
         except Exception as e:
-            LOG.error("" +self._name +' Database exception! ' +str(e))
+            LOG.error("save_messages_to_db" +self._name +f" Database exception! {e}")
             db.rollback()
             return False
         finally:
@@ -134,7 +134,7 @@ class Database:
             db.commit()
             return True
         except Exception as e:
-            LOG.error("" +self._name +' Database exception! ' +str(e))
+            LOG.error("update_messages" +self._name +f" Database exception! {e}")
             db.rollback()
             return False
         finally:
@@ -149,7 +149,7 @@ class Database:
             db.commit()
             return True
         except Exception as e:
-            LOG.error("" +self._name +' Database exception! ' +str(e))
+            LOG.error("delete_message" +self._name +f" Database exception! {e}")
             db.rollback()
             return False
         finally:
@@ -164,7 +164,7 @@ class Database:
             db.commit()
             return True
         except Exception as e:
-            LOG.error("" +self._name +' Database exception! ' +str(e))
+            LOG.error("delete_messages" +self._name +f" Database exception! {e}")
             db.rollback()
             return False
         finally:

toxygen/middleware/callbacks.py

@@ -365,7 +365,7 @@ def callback_audio(calls_manager):
         """
         New audio chunk
         """
-        LOG_DEBUG(f"callback_audio #{friend_number}")
+#trace        LOG_DEBUG(f"callback_audio #{friend_number}")
         # dunno was .call
         calls_manager._call.audio_chunk(
             bytes(samples[:audio_samples_per_channel * 2 * audio_channels_count]),
@@ -402,7 +402,7 @@ 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 toxav_video_receive_frame_cb={friend_number}")
-    import cv2
+    with ts.ignoreStdout(): import cv2
     import numpy as np
     try:
         y_size = abs(max(width, abs(ystride)))
@@ -426,7 +426,7 @@ def video_receive_frame(toxav, friend_number, width, height, y, u, v, ystride, u
         frame[height * 5 // 4:, width // 2:] = v[1:height // 2:2, :width // 2]
 
         frame = cv2.cvtColor(frame, cv2.COLOR_YUV2BGR_I420)
-
+        # imshow
         invoke_in_main_thread(cv2.imshow, str(friend_number), frame)
     except Exception as ex:
         LOG_ERROR(f"video_receive_frame  {ex} #{friend_number}")

toxygen/middleware/threads.py

@@ -23,7 +23,7 @@ def LOG_ERROR(l): print('EROR+ '+l)
 def LOG_WARN(l):  print('WARN+ '+l)
 def LOG_INFO(l):  print('INFO+ '+l)
 def LOG_DEBUG(l): print('DBUG+ '+l)
-def LOG_TRACE(l): pass # print('TRACE+ '+l)
+def LOG_TRACE(l): pass # print('TRAC+ '+l)
 
 iLAST_CONN = 0
 iLAST_DELTA = 60

toxygen/ui/av_widgets.py

@@ -118,7 +118,7 @@ class IncomingCallWidget(widgets.CenteredWidget):
             self.thread = None
 
     def stop(self):
-        LOG.debug(f"stop from {self._friend_number}")
+        LOG.debug(f"stop from friend_number={self._friend_number}")
         if self._processing:
             self.close()
         if self.thread is not None:
@@ -147,7 +147,9 @@ class IncomingCallWidget(widgets.CenteredWidget):
         try:
             self._calls_manager.accept_call(self._friend_number, True, False)
         finally:
-            self.stop()
+            #? self.stop()
+            LOG.debug(f" accept_call_with_audio NOT stop from={self._friend_number}")
+            pass
 
     def accept_call_with_video(self):
         # ts.trepan_handler()

toxygen/ui/main_screen.py

@@ -1,5 +1,6 @@
 # -*- mode: python; indent-tabs-mode: nil; py-indent-offset: 4; coding: utf-8 -*-
 import os
+import traceback
 
 from  qtpy import uic
 from  qtpy import QtCore, QtGui, QtWidgets
@@ -701,10 +702,15 @@ class MainWindow(QtWidgets.QMainWindow):
         if self._we:
             self._we.show()
             return
+        try:
+            from qweechat import qweechat
+            from qweechat.config import write
             LOG.info("Loading WeechatConsole")
+        except ImportError as e:
+            LOG.error(f"ImportError Loading import qweechat {e} {sys.path}")
+            LOG.debug(traceback.print_exc())
+            return
 
-        from third_party.qweechat import qweechat
-        from third_party.qweechat import config
         try:
             # WeeChat backported from PySide6 to PyQt5
             LOG.info("Adding WeechatConsole")
@@ -717,7 +723,7 @@ class MainWindow(QtWidgets.QMainWindow):
                     self.network.disconnect_weechat()
                     if self.network.debug_dialog:
                         self.network.debug_dialog.close()
-                    qweechat.config.write(self.config)
+                    write(self.config)
         except Exception as e:
             LOG.exception(f"ERROR WeechatConsole {e}")
             MainWindow = None

toxygen/ui/main_screen_widgets.py

@@ -4,8 +4,7 @@ import urllib
 import re
 
 from  qtpy import QtCore, QtGui, QtWidgets
-from PyQt5.QtCore import pyqtSignal
-Signal = pyqtSignal
+from  qtpy.QtCore import Signal
 
 from ui.widgets import RubberBandWindow, create_menu, QRightClickButton, CenteredWidget, LineEdit
 import utils.util as util

toxygen/ui/menu.py

@@ -594,7 +594,7 @@ class VideoSettings(CenteredWidget):
 
     def _update_ui(self):
         try:
-            import cv2
+            with ts.ignoreStdout(): import cv2
         except ImportError:
             cv2 = None
         self.deviceComboBox.currentIndexChanged.connect(self._device_changed)

toxygen/ui/widgets_factory.py

@@ -43,7 +43,7 @@ class WidgetsFactory:
 
     def create_video_settings_window(self):
         try:
-            import cv2
+            with ts.ignoreStdout(): import cv2
         except ImportError:
             cv2 = None
         if cv2 is None: return None

toxygen/updater/updater.py

@@ -10,11 +10,11 @@ import subprocess
 global LOG
 import logging
 LOG = logging.getLogger('app.'+__name__)
-log = lambda x: LOG.info(x)
 
 TIMEOUT=10
 
 def connection_available():
+    return False
     try:
         urllib.request.urlopen('http://216.58.192.142', timeout=TIMEOUT)  # google.com
         return True