More linter and types

Author: C0rn3j

scc/controller.py

@@ -6,7 +6,7 @@
 
 if TYPE_CHECKING:
 	from scc.controller import HapticData
-
+	from scc.mapper import Mapper
 import logging
 import time
 
@@ -15,17 +15,16 @@
 next_id = 1 # Used with fallback controller id generator
 
 class Controller(object):
-	"""
-	Base class for all controller drivers. Implementations are in
-	scc.drivers package.
+	"""Base class for all controller drivers. Implementations are in scc.drivers package.
 
 	Derived class should implement every method from here.
 	"""
+
 	flags = 0
 
-	def __init__(self):
+	def __init__(self) -> None:
 		global next_id
-		self.mapper = None
+		self.mapper: Mapper | None = None
 		self._id = next_id
 		next_id += 1
 		self.lastTime = time.time()
@@ -66,7 +65,7 @@ def get_gui_config_file(self) -> None:
 		return None
 
 
-	def set_mapper(self, mapper):
+	def set_mapper(self, mapper: Mapper):
 		""" Sets mapper for controller """
 		self.mapper = mapper
 

scc/drivers/ds4drv.py

@@ -148,7 +148,7 @@ def _load_hid_descriptor(self, config, max_size, vid, pid, test_mode):
 		self._packet_size = 64
 
 
-	def input(self, endpoint, data):
+	def input(self, endpoint: bytearray, data: int) -> None:
 		# Special override for CPAD touch button
 		if _lib.decode(ctypes.byref(self._decoder), data):
 			if self.mapper:

scc/drivers/hiddrv.py

@@ -8,6 +8,10 @@
 import os
 import sys
 from enum import IntEnum
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+	from scc.sccdaemon import SCCDaemon
 
 from scc.constants import STICK_PAD_MAX, STICK_PAD_MIN, ControllerFlags, SCButtons
 from scc.controller import Controller
@@ -202,7 +206,7 @@ class HIDController(USBDevice, Controller):
 			| ControllerFlags.HAS_DPAD
 			| ControllerFlags.NO_GRIPS )
 
-	def __init__(self, device, daemon, handle, config_file, config, test_mode=False):
+	def __init__(self, device, daemon: "SCCDaemon", handle, config_file, config, test_mode=False):
 		USBDevice.__init__(self, device, handle)
 		self._ready = False
 		self.daemon = daemon

scc/drivers/usb.py

@@ -35,8 +35,7 @@ def __init__(self, device, handle):
 
 
 	def set_input_interrupt(self, endpoint, size, callback):
-		"""
-		Helper method for setting up input transfer.
+		"""Set up input transfer.
 
 		callback(endpoint, data) is called repeadedly with every packed received.
 		"""
@@ -66,7 +65,7 @@ def callback_wrapper(transfer):
 
 
 	def send_control(self, index, data):
-		""" Schedules writing control to device """
+		"""Schedules writing control to device."""
 		zeros = b'\x00' * (64 - len(data))
 
 		self._cmsg.insert(0, (

scc/lib/hidparse.py

@@ -101,7 +101,7 @@ def enum_or_reserved(enum, value):
 _HIDIOCGRDESCSIZE =	ioctl_opt.IOR(ord('H'), 0x01, ctypes.c_int)
 _HIDIOCGRDESC =		ioctl_opt.IOR(ord('H'), 0x02, _hidraw_report_descriptor)
 _HIDIOCGRAWINFO =	ioctl_opt.IOR(ord('H'), 0x03, _hidraw_devinfo)
-#_HIDIOCGFEATURE =	lambda len : ioctl_opt.IORW(ord('H'), 0x07, len)
+#_HIDIOCGFEATURE =	lambda len : ioctl_opt.IOWR(ord('H'), 0x07, len)
 _HIDIOCGFEATURE = lambda len: ioctl_opt.IOC(
 	ioctl_opt.IOC_WRITE|ioctl_opt.IOC_READ, ord('H'), 0x07, len)
 

scc/modifiers.py

@@ -60,7 +60,7 @@ def _mod_init(self):
 
 
 	def _mod_to_string(self, params, multiline, pad):
-		""" Adds action at end of params list and generates string """
+		"""Add action at end of params list and generate a string."""
 		if multiline:
 			childstr = self.action.to_string(True, pad + 2)
 			if len(params) > 0:

scc/x11/scc-osd-daemon.py

@@ -1,37 +1,39 @@
 #!/usr/bin/env python3
 
-"""
-SC-Controller - OSD Daemon
+"""SC-Controller - OSD Daemon.
 
 Controls stuff displayed as OSD.
 """
-from scc.tools import set_logging_level
-
+import logging
 import os
 import sys
-import logging
 import time
 import traceback
+
 import gi
+
+from scc.tools import set_logging_level
+
 gi.require_version('Gtk', '3.0')
 gi.require_version('Rsvg', '2.0')
 gi.require_version('GdkX11', '3.0')
-from gi.repository import Gtk, Gdk, GdkX11, GLib
+from gi.repository import Gdk, GdkX11, GLib, Gtk
+
+from scc.config import Config
 from scc.gui.daemon_manager import DaemonManager
+from scc.osd import OSDWindow
+from scc.osd.area import Area
+from scc.osd.dialog import Dialog
 from scc.osd.gesture_display import GestureDisplay
-from scc.osd.radial_menu import RadialMenu
-from scc.osd.hmenu import HorizontalMenu
-from scc.osd.quick_menu import QuickMenu
 from scc.osd.grid_menu import GridMenu
+from scc.osd.hmenu import HorizontalMenu
 from scc.osd.keyboard import Keyboard
-from scc.osd.message import Message
-from scc.osd.dialog import Dialog
-from scc.osd import OSDWindow
 from scc.osd.menu import Menu
-from scc.osd.area import Area
+from scc.osd.message import Message
+from scc.osd.quick_menu import QuickMenu
+from scc.osd.radial_menu import RadialMenu
 from scc.special_actions import OSDAction
 from scc.tools import shsplit
-from scc.config import Config
 
 log = logging.getLogger("osd.daemon")