GitLab

at 2023-05-27T17:28:13+02:00

refactor: Simplify launch.py

cq: Use capitalized env var name

cq: Remove unnecessary list comprehension

cq: Ignore false positive ruff error

refactor: JingleRTP: Don’t call external process for pipeline debug

cq: Update ruff version

 repos:

   - repo: https://github.com/charliermarsh/ruff-pre-commit

-    rev: v0.0.259

+    rev: v0.0.270

     hooks:

       - id: ruff

         exclude: ".githooks/"

             else:

                 # Documents and Settings\[User Name]\Application Data\Gajim

                 self.config_root = self.cache_root = self.data_root = \

-                    Path(os.environ['appdata']) / 'Gajim'

+                    Path(os.environ['APPDATA']) / 'Gajim'

         else:

             self.config_root = Path(GLib.get_user_config_dir()) / 'gajim'

             self.cache_root = Path(GLib.get_user_cache_dir()) / 'gajim'

         if sys.platform != 'win32':

             Gio.AppInfo.launch_default_for_uri(uri)

         else:

-            os.startfile(uri)

+            os.startfile(uri)  # noqa: S606

     except Exception as err:

         log.info("Couldn't open file URI %s: %s", uri, err)

 

 from typing import Optional

 

 import logging

-import os

 import socket

 from collections import deque

 from datetime import datetime

     pass

 

 from gajim.common import app

+from gajim.common import configpaths

 from gajim.common.i18n import _

 from gajim.common.jingle_content import contents

 from gajim.common.jingle_content import JingleContent

         self.pipeline.set_state(Gst.State.PLAYING)

 

         if log.getEffectiveLevel() == logging.DEBUG:

-            # Use 'export GST_DEBUG_DUMP_DOT_DIR=/tmp/' before starting Gajim

             timestamp = datetime.now().strftime('%m-%d-%Y-%H-%M-%S')

             name = f'video-graph-{timestamp}'

-            debug_dir = os.environ.get('GST_DEBUG_DUMP_DOT_DIR')

-            name_dot = f'{debug_dir}/{name}.dot'

-            name_png = f'{debug_dir}/{name}.png'

+            filename = configpaths.get('DEBUG') / f'{name}.dot'

             Gst.debug_bin_to_dot_file(

-                self.pipeline, Gst.DebugGraphDetails.ALL, name)

-            if debug_dir:

-                try:

-                    os.system(f'dot -Tpng {name_dot} > {name_png}')

-                except Exception:

-                    log.debug('Could not save pipeline graph. Make sure '

-                              'graphviz is installed.')

+                self.pipeline, Gst.DebugGraphDetails.ALL, str(filename))

 

     @staticmethod

     def get_fallback_src() -> Optional[Gst.Bin]:

     @property

     def is_available(self) -> bool:

         # pylint: disable=R1729

-        return any([contact.is_available for contact

-                    in self._resources.values()])

+        return any(contact.is_available for contact

+                   in self._resources.values())

 

     @property

     def show(self):

             samples = self._samples

 

         # Normalize both channels using the same scale

-        max_elem = max(max(samples))

-        min_elem = min(min(samples))

+        max_elem = max(max(samples))  # noqa: PLW3301

+        min_elem = min(min(samples))  # noqa: PLW3301

         delta = max_elem - min_elem

         if delta > 0:

             self._samples = [

 

 import subprocess

 

-from gajim import gajim

+import gajim

+from gajim.gajim import main

 

 try:

-    p = subprocess.Popen('git rev-parse --short=12 HEAD', shell=True,

-                         stdout=subprocess.PIPE, stderr=subprocess.DEVNULL)

-    node = p.communicate()[0]

-    if node:

-        import gajim as g

-        g.__version__ += '+' + node.decode('utf-8').strip()

+    res = subprocess.check_output(

+        ['git', 'rev-parse', '--short=12', 'HEAD'])  # noqa: S603, S607

+    gajim.__version__ += f'+{res.decode().strip()}'

 except Exception:

     pass

 

-gajim.main()
+main()
   "N806",   # Variable should be lower case

   "N817",   # CamelCase imported as acronym

   "N818",   # Exception name should be named with an Error suffix

+  "PGH003", # Use specific rule codes when ignoring type issues

   "PLC1901",# Expression can be simplified to x as an empty string is falsey

   "PLR0911",# Too many return statements

   "PLR0912",# Too many branches

 "test/*" = ["E402"]

 "test/common/test_styling.py" = ["RUF001", "E501"]

 "test/common/test_regex.py" = ["RUF001"]

+"pep517build/*" = ["S603", "S607"]

+"mac/*" = ["S603", "S607"]

+"win/*" = ["S603", "S607"]

+"scripts/*" = ["S603", "S607"]

 

 [tool.ruff.mccabe]

 max-complexity = 15

Philipp Hörist pushed to branch master at gajim / gajim

Commits:

8 changed files:

Changes: