Fixes 1-Click release for 7.11

build/win/makedist_win.bat

@@ -46,7 +46,7 @@ REM Arno: When adding files here, make sure tribler.nsi actually
 REM packs them in the installer .EXE
 
 python3 -m pip install --upgrade --no-deps --force-reinstall pydantic --no-binary pydantic
-python3 -m pip install --upgrade --no-deps --force-reinstall typing_extensions --no-binary typing_extensions
+python3 -m pip install --upgrade --no-deps --force-reinstall typing_extensions==3.10.0.2 --no-binary typing_extensions
 
 %PYTHONHOME%\Scripts\pyinstaller.exe tribler.spec
 

src/run_tribler.py

@@ -1,18 +1,22 @@
+# A fix for "LookupError: unknown encoding: idna" error.
+# Adding encodings.idna to hiddenimports is not enough.
+# https://github.com/pyinstaller/pyinstaller/issues/1113
+import encodings.idna  # pylint: disable=unused-import
 import logging.config
 import os
 import sys
 
 from PyQt5.QtCore import QSettings
 
+from tribler_common.sentry_reporter.sentry_reporter import SentryReporter, SentryStrategy
+from tribler_common.sentry_reporter.sentry_scrubber import SentryScrubber
+
 logger = logging.getLogger(__name__)
 CONFIG_FILE_NAME = 'triblerd.conf'
 
 # pylint: disable=import-outside-toplevel, ungrouped-imports
 
 def init_sentry_reporter():
-    from tribler_common.sentry_reporter.sentry_reporter import SentryReporter, SentryStrategy
-    from tribler_common.sentry_reporter.sentry_scrubber import SentryScrubber
-
     """ Initialise sentry reporter
 
     We use `sentry_url` as a URL for normal tribler mode and TRIBLER_TEST_SENTRY_URL
@@ -135,7 +139,10 @@ def init_boot_logger():
             logger.info("Shutting down Tribler")
             if trace_logger:
                 trace_logger.close()
+
             # Flush all the logs to make sure it is written to file before it exits
             for handler in logging.getLogger().handlers:
                 handler.flush()
+
+            SentryReporter.global_strategy = SentryStrategy.SEND_SUPPRESSED
             raise

src/tribler-common/tribler_common/sentry_reporter/sentry_reporter.py

@@ -118,6 +118,7 @@ def scrub_event(self, event):
                 ThreadingIntegration(propagate_hub=True),
             ],
             before_send=SentryReporter._before_send,
+            ignore_errors=[KeyboardInterrupt],
         )
 
         ignore_logger(SentryReporter._sentry_logger_name)

src/tribler-core/tribler_core/check_os.py

@@ -89,8 +89,14 @@ def should_kill_other_tribler_instances(root_state_dir):
     if current_pid != old_pid and old_pid > 0:
         # If the old process is a zombie, simply kill it and restart Tribler
         old_process = psutil.Process(old_pid)
-        logger.info(f'Old process status: {old_process.status()}')
-        if old_process.status() == psutil.STATUS_ZOMBIE:
+        try:
+            old_process_status = old_process.status()
+        except psutil.NoSuchProcess:
+            logger.info('Old process not found')
+            return
+
+        logger.info(f'Old process status: {old_process_status}')
+        if old_process_status == psutil.STATUS_ZOMBIE:
             kill_tribler_process(old_process)
             restart_tribler_properly()
             return

src/tribler-core/tribler_core/start_core.py

@@ -174,12 +174,15 @@ def start_tribler_core(base_path, api_port, api_key, root_state_dir, gui_test_mo
     loop = asyncio.get_event_loop()
     loop.set_exception_handler(CoreExceptionHandler.unhandled_error_observer)
 
-    loop.run_until_complete(core_session(config, components=list(components_gen(config))))
-
-    if trace_logger:
-        trace_logger.close()
-
-    process_checker.remove_lock_file()
-    # Flush the logs to the file before exiting
-    for handler in logging.getLogger().handlers:
-        handler.flush()
+    try:
+        loop.run_until_complete(core_session(config, components=list(components_gen(config))))
+    finally:
+        if trace_logger:
+            trace_logger.close()
+
+        logger.info('Remove lock file')
+        process_checker.remove_lock_file()
+
+        # Flush the logs to the file before exiting
+        for handler in logging.getLogger().handlers:
+            handler.flush()

src/tribler-core/tribler_core/tests/test_check_os.py

@@ -1,8 +1,10 @@
-from unittest.mock import patch
+from unittest.mock import Mock, patch
+
+import psutil
 
 import pytest
 
-from tribler_core.check_os import error_and_exit
+from tribler_core.check_os import error_and_exit, should_kill_other_tribler_instances
 
 pytestmark = pytest.mark.asyncio
 
@@ -14,3 +16,35 @@ async def test_error_and_exit(mocked_show_system_popup, mocked_sys_exit):
     error_and_exit('title', 'text')
     mocked_show_system_popup.assert_called_once_with('title', 'text')
     mocked_sys_exit.assert_called_once_with(1)
+
+
+@patch('tribler_core.check_os.logger.info')
+@patch('sys.argv', [])
+@patch('tribler_core.check_os.get_existing_tribler_pid', Mock(return_value=100))
+@patch('os.getpid', Mock(return_value=200))
+@patch('psutil.Process', Mock(return_value=Mock(status=Mock(side_effect=psutil.NoSuchProcess(100)))))
+def test_should_kill_other_tribler_instances_process_not_found(
+    mocked_logger_info: Mock
+):
+    root_state_dir = Mock()
+    should_kill_other_tribler_instances(root_state_dir)
+    mocked_logger_info.assert_called_with('Old process not found')
+
+
+@patch('tribler_core.check_os.logger.info')
+@patch('sys.argv', [])
+@patch('tribler_core.check_os.get_existing_tribler_pid', Mock(return_value=100))
+@patch('os.getpid', Mock(return_value=200))
+@patch('psutil.Process', Mock(return_value=Mock(status=Mock(return_value=psutil.STATUS_ZOMBIE))))
+@patch('tribler_core.check_os.kill_tribler_process')
+@patch('tribler_core.check_os.restart_tribler_properly')
+def test_should_kill_other_tribler_instances_zombie(
+    mocked_restart_tribler_properly: Mock,
+    mocked_kill_tribler_process: Mock,
+    mocked_logger_info: Mock,
+):
+    root_state_dir = Mock()
+    should_kill_other_tribler_instances(root_state_dir)
+    mocked_logger_info.assert_called()
+    mocked_kill_tribler_process.assert_called_once()
+    mocked_restart_tribler_properly.assert_called_once()

src/tribler-gui/tribler_gui/core_manager.py

@@ -64,7 +64,12 @@ def on_core_read_ready(self):
         if b'Traceback' in raw_output:
             self.core_traceback = decoded_output
             self.core_traceback_timestamp = int(round(time.time() * 1000))
-        print(decoded_output.strip())  # noqa: T001
+        try:
+            print(decoded_output.strip())  # noqa: T001
+        except OSError:
+            # Possible reason - cannot write to stdout as it was already closed during the application shutdown
+            if not self.shutting_down:
+                raise
 
     def on_core_finished(self, exit_code, exit_status):
         if self.shutting_down and self.should_stop_on_shutdown:
@@ -197,7 +202,9 @@ def on_received_state(self, state):
             raise RuntimeError(state['last_exception'])
 
     def stop(self, stop_app_on_shutdown=True):
+        self._logger.info("Stopping Core manager")
         if self.core_process or self.is_core_running:
+            self._logger.info("Sending shutdown request to Tribler Core")
             self.events_manager.shutting_down = True
             TriblerNetworkRequest("shutdown", lambda _: None, method="PUT", priority=QNetworkRequest.HighPriority)
 

src/tribler-gui/tribler_gui/error_handler.py

@@ -3,7 +3,7 @@
 import traceback
 
 from tribler_common.reported_error import ReportedError
-from tribler_common.sentry_reporter.sentry_reporter import SentryReporter
+from tribler_common.sentry_reporter.sentry_reporter import SentryReporter, SentryStrategy
 
 # fmt: off
 from tribler_gui.dialogs.feedbackdialog import FeedbackDialog
@@ -26,6 +26,10 @@ def gui_error(self, *exc_info):
             return
 
         info_type, info_error, tb = exc_info
+        if SentryReporter.global_strategy == SentryStrategy.SEND_SUPPRESSED:
+            self._logger.info(f'GUI error was suppressed and not sent to Sentry: {info_type.__name__}: {info_error}')
+            return
+
         if info_type in self._handled_exceptions:
             return
         self._handled_exceptions.add(info_type)

src/tribler-gui/tribler_gui/tests/test_core_manager.py

@@ -33,3 +33,19 @@ async def test_on_core_finished_raises_error():
 
     with pytest.raises(CoreCrashedError):
         core_manager.on_core_finished(exit_code=1, exit_status='exit status')
+
+
+@patch('tribler_gui.core_manager.EventRequestManager', new=MagicMock())
+@patch('builtins.print', MagicMock(side_effect=OSError()))
+def test_on_core_read_ready():
+    # test that OSError on writing to stdout is suppressed during shutting down
+
+    core_manager = CoreManager(MagicMock(), MagicMock(), MagicMock())
+    core_manager.core_process = MagicMock(read_all=MagicMock(return_value=''))
+
+    with pytest.raises(OSError):
+        core_manager.on_core_read_ready()
+
+    core_manager.shutting_down = True
+    # no exception during shutting down
+    core_manager.on_core_read_ready()

src/tribler-gui/tribler_gui/tests/test_error_handler.py

@@ -3,6 +3,7 @@
 import pytest
 
 from tribler_common.reported_error import ReportedError
+from tribler_common.sentry_reporter.sentry_reporter import SentryStrategy
 
 from tribler_gui.error_handler import ErrorHandler
 from tribler_gui.exceptions import CoreConnectTimeoutError, CoreCrashedError
@@ -31,6 +32,17 @@ async def test_gui_error_tribler_stopped(mocked_feedback_dialog: MagicMock, erro
     mocked_feedback_dialog.assert_not_called()
 
 
+@patch('tribler_gui.error_handler.FeedbackDialog')
+@patch('tribler_common.sentry_reporter.sentry_reporter.SentryReporter.global_strategy', SentryStrategy.SEND_SUPPRESSED)
+async def test_gui_error_suppressed(mocked_feedback_dialog: MagicMock, error_handler: ErrorHandler):
+    logger_info_mock = MagicMock()
+    error_handler._logger = MagicMock(info=logger_info_mock)
+    error_handler.gui_error(AssertionError, AssertionError('error_text'), None)
+    mocked_feedback_dialog.assert_not_called()
+    assert not error_handler._handled_exceptions
+    logger_info_mock.assert_called_with('GUI error was suppressed and not sent to Sentry: AssertionError: error_text')
+
+
 @patch('tribler_gui.error_handler.FeedbackDialog')
 async def test_gui_info_type_in_handled_exceptions(mocked_feedback_dialog: MagicMock, error_handler: ErrorHandler):
     # test that if exception type in _handled_exceptions then FeedbackDialog is not called

src/tribler-gui/tribler_gui/tribler_window.py

@@ -1072,6 +1072,7 @@ def show_force_shutdown():
         self.gui_settings.setValue("size", self.size())
 
         if self.core_manager.use_existing_core:
+            self._logger.info("Quitting Tribler GUI without stopping Tribler Core")
             # Don't close the core that we are using
             QApplication.quit()
 

tribler.spec

@@ -93,18 +93,19 @@ hiddenimports = [
     'csv',
     'dataclasses',  # https://github.com/pyinstaller/pyinstaller/issues/5432
     'ecdsa',
-    'pyaes',
     'PIL',
-    'scrypt', '_scrypt',
-    'sqlalchemy', 'sqlalchemy.ext.baked', 'sqlalchemy.ext.declarative',
     'pkg_resources', # 'pkg_resources.py2_warn', # Workaround PyInstaller & SetupTools, https://github.com/pypa/setuptools/issues/1963
-    'requests',
+    'pyaes',
     'pydantic',
-    'PyQt5.QtTest',
     'pyqtgraph',
     'pyqtgraph.graphicsItems.PlotItem.plotConfigTemplate_pyqt5',
     'pyqtgraph.graphicsItems.ViewBox.axisCtrlTemplate_pyqt5',
     'pyqtgraph.imageview.ImageViewTemplate_pyqt5',
+    'PyQt5.QtTest',
+    'requests',
+    'scrypt', '_scrypt',
+    'sqlalchemy', 'sqlalchemy.ext.baked', 'sqlalchemy.ext.declarative',
+    'typing_extensions',
 ] + widget_files + pony_deps + get_sentry_hooks()
 
 # https://github.com/pyinstaller/pyinstaller/issues/5359