Tear out hardcoded libusb1 and enum libraries. WHAT THE HELL. libusb1 is now a real dependency.

Also some linter changes as is customary

Author: C0rn3j

README.md

@@ -45,6 +45,7 @@ Donation links for kozec, who is the original developer, can be found on the [ol
   - [python-evdev](https://python-evdev.readthedocs.io/en/latest/)
   - [python-pylibacl](http://pylibacl.k1024.org/)
   - [python-vdf](https://pypi.org/project/vdf/)
+  - python-libusb1
   - [gtk-layer-shell](https://github.com/wmww/gtk-layer-shell)
 
 ### Installing

scc/cemuhook_server.py

@@ -1,18 +1,19 @@
-#!/usr/bin/env python3
-"""
-SC-Controller - Daemon - CemuHookUDP motion provider
+"""SC-Controller - Daemon - CemuHookUDP motion provider.
 
 Accepts all connections from clients and sends data captured
 by 'cemuhook' actions to them.
 """
-from scc.tools import find_library
-from scc.lib.enum import IntEnum
-from ctypes import c_uint32, c_int, c_bool, c_char_p, c_size_t, c_float
-from ctypes import create_string_buffer
-import logging, os, socket
+import logging
+import os
+import socket
+from ctypes import c_bool, c_char_p, c_float, c_int, c_size_t, create_string_buffer
+from datetime import datetime, timedelta
+from enum import IntEnum
 from threading import Thread
 from time import sleep
-from datetime import datetime, timedelta
+
+from scc.tools import find_library
+
 log = logging.getLogger("CemuHook")
 
 BUFFER_SIZE = 1024

scc/device_monitor.py

@@ -52,7 +52,7 @@ def add_callback(self, subsystem: str, vendor_id: int, product_id: int, added_cb
 		"""
 		key = (subsystem, vendor_id, product_id)
 		# TODO type this, might need 3.11 for https://docs.python.org/3/library/typing.html#typing.Self ?
-		# print(f"add_callback for subsystem {subsystem} for {vendor_id}:{product_id} - existing {self.dev_added_cbs}; of type {type(self.dev_added_cbs)} with existing removals {self.dev_removed_cbs}; of type {type(self.dev_removed_cbs)}")
+		# print(f"add_callback for subsystem {subsystem} for {vendor_id}:{product_id} - existing {self.dev_added_cbs}; of type {type(self.dev_added_cbs)} with existing removals {self.dev_removed_cbs}; of type {type(self.dev_removed_cbs)}\n")
 		# print(f"  {added_cb}; of type {type(added_cb)} with additional removals {added_cb}; of type {type(added_cb)}\n")
 		assert key not in self.dev_added_cbs, (f"DeviceMonitor add_callback found an already present device: \n    {key[0], key[1], key[2]} in hex: {hex(key[1]), hex(key[2])}\n  in existing DeviceMonitor cbs:\n    {self.dev_added_cbs}\n \
 			Perhaps a custom device was added to config that we already considered earlier? Check $config_dir/scc/devices/")

scc/drivers/sc_by_cable.py

@@ -1,17 +1,18 @@
-#!/usr/bin/env python3
-"""
-SC Controller - Steam Controller Driver
+"""SC Controller - Steam Controller Driver.
 
 Called and used when single Steam Controller is connected directly by USB cable.
 
 Shares a lot of classes with sc_dongle.py
 """
 
-from scc.lib.usb1 import USBError
+import logging
+import struct
+
+from usb1 import USBError
+
 from scc.drivers.usb import USBDevice, register_hotplug_device
-from .sc_dongle import ControllerInput, TUP_FORMAT
-from .sc_dongle import SCStatus, SCController
-import struct, logging
+
+from .sc_dongle import TUP_FORMAT, ControllerInput, SCController, SCStatus
 
 VENDOR_ID = 0x28de
 PRODUCT_ID = 0x1102
@@ -22,48 +23,48 @@
 log = logging.getLogger("SCCable")
 
 def init(daemon, config):
-	""" Registers hotplug callback for controller dongle """
+	"""Register hotplug callback for controller dongle."""
 	def cb(device, handle):
 		return SCByCable(device, handle, daemon)
-	
+
 	register_hotplug_device(cb, VENDOR_ID, PRODUCT_ID)
 	return True
 
 
 class SCByCable(USBDevice, SCController):
 	FORMAT1 = b'>BBBBB13sB2s'
-	
+
 	def __init__(self, device, handle, daemon):
 		self.daemon = daemon
 		USBDevice.__init__(self, device, handle)
 		SCController.__init__(self, self, CONTROLIDX, ENDPOINT)
 		self._ready = False
 		self._last_tup = None
 		daemon.add_mainloop(self._timer)
-		
+
 		self.claim_by(klass=3, subclass=0, protocol=0)
 		self.read_serial()
-	
-	
+
+
 	def generate_serial(self):
 		self._serial = "%s:%s" % (self.device.getBusNumber(), self.device.getPortNumber())
-	
-	
+
+
 	def disconnected(self):
 		# Overrided to skip returning serial# to pool.
 		pass
-	
-	
+
+
 	def __repr__(self):
 		return "<SCByCable %s>" % (self.get_id(),)
-	
-	
-	def on_serial_got(self):	
+
+
+	def on_serial_got(self):
 		log.debug("Got wired SC with serial %s", self._serial)
 		self._id = "sc%s" % (self._serial,)
-		self.set_input_interrupt(ENDPOINT, 64, self._wait_input)	
-	
-	
+		self.set_input_interrupt(ENDPOINT, 64, self._wait_input)
+
+
 	def _wait_input(self, endpoint, data):
 		tup = ControllerInput._make(struct.unpack(TUP_FORMAT, data))
 		if not self._ready:
@@ -72,8 +73,8 @@ def _wait_input(self, endpoint, data):
 			self._ready = True
 		if tup.status == SCStatus.INPUT:
 			self._last_tup = tup
-	
-	
+
+
 	def _timer(self):
 		m = self.get_mapper()
 		if m:
@@ -89,15 +90,15 @@ def _timer(self):
 				log.exception(e)
 				log.error("Error while communicating with device, baling out...")
 				self.force_restart()
-	
-	
+
+
 	def close(self):
 		if self._ready:
 			self.daemon.remove_controller(self)
 			self._ready = False
 		self.daemon.remove_mainloop(self._timer)
 		USBDevice.close(self)
-	
-	
+
+
 	def turnoff(self):
 		log.warning("Ignoring request to turn off wired controller.")

scc/drivers/steamdeck.py

@@ -1,6 +1,4 @@
-#!/usr/bin/env python3
-"""
-SCC - Steam Deck Driver
+"""SCC - Steam Deck Driver.
 
 Based on sc_by_cable and steamdeck.c
 
@@ -10,23 +8,23 @@
 to not do so periodically.
 """
 
-from scc.lib import IntEnum
-from scc.lib.usb1 import USBError
+import ctypes
+import logging
+import struct
+
+from scc.constants import STICK_PAD_MAX, STICK_PAD_MIN, ControllerFlags, SCButtons
+from scc.drivers.sc_dongle import SCController, SCPacketType
 from scc.drivers.usb import USBDevice, register_hotplug_device
-from scc.constants import STICK_PAD_MIN, STICK_PAD_MAX
-from scc.constants import SCButtons, ControllerFlags
-from scc.drivers.sc_dongle import ControllerInput, SCController, SCPacketType
-import struct, logging, ctypes
-
-
-VENDOR_ID			= 0x28de
-PRODUCT_ID			= 0x1205
-ENDPOINT			= 3
-CONTROLIDX			= 2
-PACKET_SIZE			= 128
-UNLIZARD_INTERVAL	= 100
+from scc.lib import IntEnum
+
+VENDOR_ID         = 0x28de
+PRODUCT_ID        = 0x1205
+ENDPOINT          = 3
+CONTROLIDX        = 2
+PACKET_SIZE       = 128
+UNLIZARD_INTERVAL = 100
 # Basically, sticks on deck tend to return to non-zero position
-STICK_DEADZONE		= 3000
+STICK_DEADZONE    = 3000
 
 log = logging.getLogger("deck")
 
@@ -41,7 +39,7 @@ class DeckInput(ctypes.Structure):
 		('lpad_y', ctypes.c_int16),
 		('rpad_x', ctypes.c_int16),
 		('rpad_y', ctypes.c_int16),
-		
+
 		('accel_x', ctypes.c_int16),
 		('accel_y', ctypes.c_int16),
 		('accel_z', ctypes.c_int16),
@@ -52,14 +50,14 @@ class DeckInput(ctypes.Structure):
 		('q2', ctypes.c_uint16),
 		('q3', ctypes.c_uint16),
 		('q4', ctypes.c_uint16),
-		
+
 		('ltrig', ctypes.c_uint16),
 		('rtrig', ctypes.c_uint16),
 		('stick_x', ctypes.c_int16),
 		('stick_y', ctypes.c_int16),
 		('rstick_x', ctypes.c_int16),
 		('rstick_y', ctypes.c_int16),
-		
+
 		# Values above are readed directly from deck
 		# Values bellow are converted so mapper can understand them
 		('dpad_x', ctypes.c_int16),
@@ -135,59 +133,59 @@ class Deck(USBDevice, SCController):
 		| ControllerFlags.IS_DECK
 		| ControllerFlags.HAS_RSTICK
 	)
-	
+
 	def __init__(self, device, handle, daemon):
 		self.daemon = daemon
 		USBDevice.__init__(self, device, handle)
 		SCController.__init__(self, self, CONTROLIDX, ENDPOINT)
 		self._old_state = DeckInput()
 		self._input = DeckInput()
 		self._ready = False
-		
+
 		self.claim_by(klass=3, subclass=0, protocol=0)
 		self.read_serial()
-	
+
 	def generate_serial(self):
 		self._serial = "%s:%s" % (self.device.getBusNumber(), self.device.getPortNumber())
-	
+
 	def disconnected(self):
 		# Overrided to skip returning serial# to pool.
 		pass
-	
+
 	def set_gyro_enabled(self, enabled):
 		# Always on on deck
 		pass
-	
+
 	def get_gyro_enabled(self):
 		# Always on on deck
 		return True
-	
+
 	def get_type(self):
 		return "deck"
-	
+
 	def __repr__(self):
 		return "<Deck %s>" % (self.get_id(),)
-	
+
 	def get_gui_config_file(self):
 		return "deck.config.json"
-	
+
 	def configure(self, idle_timeout=None, enable_gyros=None, led_level=None):
 		FORMAT = b'>BBBB60x'
 		# Timeout & Gyros
 		self._driver.overwrite_control(self._ccidx, struct.pack(
 			FORMAT, SCPacketType.CONFIGURE, 0x03, 0x08, 0x07))
-	
+
 	def clear_mappings(self):
 		FORMAT = b'>BB62x'
 		# Timeout & Gyros
 		self._driver.overwrite_control(self._ccidx,
 			struct.pack(FORMAT, SCPacketType.CLEAR_MAPPINGS, 0x01))
-	
+
 	def on_serial_got(self):
 		log.debug("Got SteamDeck with serial %s", self._serial)
 		self._id = "deck%s" % (self._serial,)
-		self.set_input_interrupt(ENDPOINT, 64, self._on_input)	
-	
+		self.set_input_interrupt(ENDPOINT, 64, self._on_input)
+
 	def _on_input(self, endpoint, data):
 		if not self._ready:
 			self.daemon.add_controller(self)
@@ -199,7 +197,7 @@ def _on_input(self, endpoint, data):
 		if self._input.seq % UNLIZARD_INTERVAL == 0:
 			# Keeps lizard mode from happening
 			self.clear_mappings()
-		
+
 		# Handle dpad
 		self._input.dpad_x = map_dpad(self._input, DeckButton.DPAD_LEFT, DeckButton.DPAD_RIGHT)
 		self._input.dpad_y = map_dpad(self._input, DeckButton.DPAD_DOWN, DeckButton.DPAD_UP)
@@ -222,20 +220,20 @@ def _on_input(self, endpoint, data):
 		self._input.stick_y = apply_deadzone(self._input.stick_y, STICK_DEADZONE)
 		self._input.rstick_x = apply_deadzone(self._input.rstick_x, STICK_DEADZONE)
 		self._input.rstick_y = apply_deadzone(self._input.rstick_y, STICK_DEADZONE)
-		
+
 		# Invert Gyro Roll to match Steam Controller coordinate system
 		self._input.groll = -self._input.groll
 
 		m = self.get_mapper()
 		if m:
 			self.mapper.input(self, self._old_state, self._input)
-	
+
 	def close(self):
 		if self._ready:
 			self.daemon.remove_controller(self)
 			self._ready = False
 		USBDevice.close(self)
-	
+
 	def turnoff(self):
 		log.warning("Ignoring request to turn off steamdeck.")
 
@@ -244,7 +242,6 @@ def init(daemon, config):
 	""" Registers hotplug callback for controller dongle """
 	def cb(device, handle):
 		return Deck(device, handle, daemon)
-	
+
 	register_hotplug_device(cb, VENDOR_ID, PRODUCT_ID)
 	return True
-

scc/drivers/usb.py

@@ -15,7 +15,7 @@
 import traceback
 from typing import TYPE_CHECKING
 
-from scc.lib import usb1
+import usb1
 
 if TYPE_CHECKING:
 	from scc.sccdaemon import SCCDaemon

scc/lib/__init__.py

@@ -1,3 +1 @@
-#!/usr/bin/env python3
-
-from .enum import Enum, IntEnum, unique
+from enum import Enum, IntEnum, unique