From a4b0b9eba69e7633cba3a4b6b7ff665a86fed74b Mon Sep 17 00:00:00 2001 From: Tayfun Bocek Date: Thu, 15 Jun 2023 03:43:15 +0300 Subject: [PATCH 1/7] Rewrite for profile generation --- rivalcfg/devices/__init__.py | 76 ++++++++++++++++++------------------ 1 file changed, 37 insertions(+), 39 deletions(-) diff --git a/rivalcfg/devices/__init__.py b/rivalcfg/devices/__init__.py index c2deef2..41c6c73 100644 --- a/rivalcfg/devices/__init__.py +++ b/rivalcfg/devices/__init__.py @@ -149,35 +149,6 @@ import os import types -from . import aerox3 # noqa: F401 -from . import aerox3_wireless_wired # noqa: F401 -from . import aerox3_wireless_wireless # noqa: F401 -from . import aerox5_wireless_wired # noqa: F401 -from . import aerox5_wireless_wireless # noqa: F401 -from . import aerox9_wireless_wired # noqa: F401 -from . import aerox9_wireless_wireless # noqa: F401 -from . import kanav2 # noqa: F401 -from . import kinzuv2 # noqa: F401 -from . import prime # noqa: F401 -from . import prime_wireless_wired # noqa: F401 -from . import prime_wireless_wireless # noqa: F401 -from . import rival3 # noqa: F401 -from . import rival3_wireless # noqa: F401 -from . import rival95 # noqa: F401 -from . import rival100 # noqa: F401 -from . import rival110 # noqa: F401 -from . import rival300 # noqa: F401 -from . import rival300s # noqa: F401 -from . import rival310 # noqa: F401 -from . import rival500 # noqa: F401 -from . import rival600 # noqa: F401 -from . import rival650 # noqa: F401 -from . import rival700 # noqa: F401 -from . import sensei310 # noqa: F401 -from . import sensei_raw # noqa: F401 -from . import sensei_ten # noqa: F401 -from .. import usbhid - PROFILES = None @@ -250,21 +221,48 @@ def _generate_profiles(): :rtype: dict """ + from . import ( + aerox3, # noqa: F401 + aerox3_wireless_wired, # noqa: F401 + aerox3_wireless_wireless, # noqa: F401 + aerox5_wireless_wired, # noqa: F401 + aerox5_wireless_wireless, # noqa: F401 + aerox9_wireless_wired, # noqa: F401 + aerox9_wireless_wireless, # noqa: F401 + kanav2, # noqa: F401 + kinzuv2, # noqa: F401 + prime, # noqa: F401 + prime_wireless_wired, # noqa: F401 + prime_wireless_wireless, # noqa: F401 + rival3, # noqa: F401 + rival3_wireless, # noqa: F401 + rival95, # noqa: F401 + rival100, # noqa: F401 + rival110, # noqa: F401 + rival300, # noqa: F401 + rival300s, # noqa: F401 + rival310, # noqa: F401 + rival500, # noqa: F401 + rival600, # noqa: F401 + rival650, # noqa: F401 + rival700, # noqa: F401 + sensei310, # noqa: F401 + sensei_raw, # noqa: F401 + sensei_ten, # noqa: F401 + ) + + profile_modules = locals() profiles = {} - for item in [globals()[name] for name in globals()]: - if not isinstance(item, types.ModuleType): - continue - if not hasattr(item, "profile"): - continue + for item in profile_modules.values(): for model in item.profile["models"]: profile = item.profile.copy() profile_name = (model["vendor_id"], model["product_id"]) del profile["models"] - for k, v in model.items(): - if k == "override_defaults": - continue - profile[k] = v - # TODO override_defaults + # if k == "override_defaults": + # continue + # profile[k] = v + + # TO-DO override defaults profiles[profile_name] = profile return profiles From 4e8d90ec2a1d5da4a1ad209b2e91fde50627597a Mon Sep 17 00:00:00 2001 From: Tayfun Bocek Date: Thu, 15 Jun 2023 03:45:49 +0300 Subject: [PATCH 2/7] Fix missing import --- rivalcfg/devices/__init__.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/rivalcfg/devices/__init__.py b/rivalcfg/devices/__init__.py index 41c6c73..581b897 100644 --- a/rivalcfg/devices/__init__.py +++ b/rivalcfg/devices/__init__.py @@ -149,6 +149,7 @@ import os import types +from .. import usbhid PROFILES = None @@ -267,4 +268,5 @@ def _generate_profiles(): return profiles -PROFILES = _generate_profiles() + +PROFILES = _generate_profiles() \ No newline at end of file From 85c4d78b35da9b26a53e26c82eee2388a7cc8fbe Mon Sep 17 00:00:00 2001 From: Tayfun Bocek Date: Thu, 15 Jun 2023 03:46:26 +0300 Subject: [PATCH 3/7] Black formatting --- rivalcfg/devices/__init__.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/rivalcfg/devices/__init__.py b/rivalcfg/devices/__init__.py index 581b897..0bcbdcb 100644 --- a/rivalcfg/devices/__init__.py +++ b/rivalcfg/devices/__init__.py @@ -268,5 +268,4 @@ def _generate_profiles(): return profiles - -PROFILES = _generate_profiles() \ No newline at end of file +PROFILES = _generate_profiles() From 48ea225031027af67113072e16e9b579c0e28514 Mon Sep 17 00:00:00 2001 From: Tayfun Bocek Date: Thu, 15 Jun 2023 03:50:43 +0300 Subject: [PATCH 4/7] Fix model transfering to profile. --- rivalcfg/devices/__init__.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rivalcfg/devices/__init__.py b/rivalcfg/devices/__init__.py index 0bcbdcb..1b8a767 100644 --- a/rivalcfg/devices/__init__.py +++ b/rivalcfg/devices/__init__.py @@ -259,6 +259,8 @@ def _generate_profiles(): profile = item.profile.copy() profile_name = (model["vendor_id"], model["product_id"]) del profile["models"] + for k, v in model.items(): + profile[k] = v # if k == "override_defaults": # continue # profile[k] = v @@ -268,4 +270,5 @@ def _generate_profiles(): return profiles -PROFILES = _generate_profiles() + +PROFILES = _generate_profiles() \ No newline at end of file From b84f82fe35dfd3e44acad0adeaf704912e97977a Mon Sep 17 00:00:00 2001 From: Tayfun Bocek Date: Thu, 15 Jun 2023 04:02:55 +0300 Subject: [PATCH 5/7] Code formatting. --- rivalcfg/devices/__init__.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/rivalcfg/devices/__init__.py b/rivalcfg/devices/__init__.py index 1b8a767..58e256b 100644 --- a/rivalcfg/devices/__init__.py +++ b/rivalcfg/devices/__init__.py @@ -147,7 +147,6 @@ import os -import types from .. import usbhid @@ -222,7 +221,7 @@ def _generate_profiles(): :rtype: dict """ - from . import ( + from . import ( # noqa: F401 aerox3, # noqa: F401 aerox3_wireless_wired, # noqa: F401 aerox3_wireless_wireless, # noqa: F401 @@ -250,7 +249,7 @@ def _generate_profiles(): sensei310, # noqa: F401 sensei_raw, # noqa: F401 sensei_ten, # noqa: F401 - ) + ) # noqa: F401 profile_modules = locals() profiles = {} @@ -270,5 +269,4 @@ def _generate_profiles(): return profiles - -PROFILES = _generate_profiles() \ No newline at end of file +PROFILES = _generate_profiles() From 7a543e58001ce6c5987aeb613cd0df0dbbb1e32d Mon Sep 17 00:00:00 2001 From: airblast Date: Thu, 15 Jun 2023 17:34:14 +0300 Subject: [PATCH 6/7] Remove extraneous ignores. Co-authored-by: Fabien LOISON --- rivalcfg/devices/__init__.py | 56 ++++++++++++++++++------------------ 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/rivalcfg/devices/__init__.py b/rivalcfg/devices/__init__.py index 58e256b..690213c 100644 --- a/rivalcfg/devices/__init__.py +++ b/rivalcfg/devices/__init__.py @@ -222,34 +222,34 @@ def _generate_profiles(): :rtype: dict """ from . import ( # noqa: F401 - aerox3, # noqa: F401 - aerox3_wireless_wired, # noqa: F401 - aerox3_wireless_wireless, # noqa: F401 - aerox5_wireless_wired, # noqa: F401 - aerox5_wireless_wireless, # noqa: F401 - aerox9_wireless_wired, # noqa: F401 - aerox9_wireless_wireless, # noqa: F401 - kanav2, # noqa: F401 - kinzuv2, # noqa: F401 - prime, # noqa: F401 - prime_wireless_wired, # noqa: F401 - prime_wireless_wireless, # noqa: F401 - rival3, # noqa: F401 - rival3_wireless, # noqa: F401 - rival95, # noqa: F401 - rival100, # noqa: F401 - rival110, # noqa: F401 - rival300, # noqa: F401 - rival300s, # noqa: F401 - rival310, # noqa: F401 - rival500, # noqa: F401 - rival600, # noqa: F401 - rival650, # noqa: F401 - rival700, # noqa: F401 - sensei310, # noqa: F401 - sensei_raw, # noqa: F401 - sensei_ten, # noqa: F401 - ) # noqa: F401 + aerox3, + aerox3_wireless_wired, + aerox3_wireless_wireless, + aerox5_wireless_wired, + aerox5_wireless_wireless, + aerox9_wireless_wired, + aerox9_wireless_wireless, + kanav2, + kinzuv2, + prime, + prime_wireless_wired, + prime_wireless_wireless, + rival3, + rival3_wireless, + rival95, + rival100, + rival110, + rival300, + rival300s, + rival310, + rival500, + rival600, + rival650, + rival700, + sensei310, + sensei_raw, + sensei_ten, + ) profile_modules = locals() profiles = {} From caab5a1abe1fe28f709299f8bc13206c48c3cfec Mon Sep 17 00:00:00 2001 From: airblast Date: Thu, 15 Jun 2023 17:35:28 +0300 Subject: [PATCH 7/7] Remove TODO for override_defaults. Co-authored-by: Fabien LOISON --- rivalcfg/devices/__init__.py | 5 ----- 1 file changed, 5 deletions(-) diff --git a/rivalcfg/devices/__init__.py b/rivalcfg/devices/__init__.py index 690213c..6d191b0 100644 --- a/rivalcfg/devices/__init__.py +++ b/rivalcfg/devices/__init__.py @@ -260,11 +260,6 @@ def _generate_profiles(): del profile["models"] for k, v in model.items(): profile[k] = v - # if k == "override_defaults": - # continue - # profile[k] = v - - # TO-DO override defaults profiles[profile_name] = profile return profiles