EG legacy filtering && move definition fixes

Author: Codel1417

lib/Backend/Definitions/Action/base_action.dart

@@ -53,17 +53,16 @@ extension ActionCategoryExtension on ActionCategory {
   }
 }
 
-@HiveType(typeId: 4)
-class BaseAction {
-  @HiveField(1)
-  String name = "";
-  @HiveField(2)
-  List<DeviceType> deviceCategory = DeviceType.values;
-  @HiveField(3)
-  final ActionCategory actionCategory = ActionCategory.hidden;
-  @HiveField(4)
-  final String uuid = "";
-  final Map<DeviceType, String> nameAlias = {};
+abstract class BaseAction {
+  String get name;
+
+  List<DeviceType> get deviceCategory;
+
+  ActionCategory get actionCategory;
+
+  String get uuid;
+
+  Map<DeviceType, String> get nameAlias;
 
   // Priority is Wings -> Ears -> Tail -> default
   String getName(BuiltSet<DeviceType> connectedDeviceTypes) {
@@ -84,10 +83,10 @@ class CommandAction extends BaseAction with _$CommandAction {
 
   @Implements<BaseAction>()
   factory CommandAction({
-    required String command,
-    required String name,
+    required final String command,
+    required final String name,
     required final String uuid,
-    required List<DeviceType> deviceCategory,
+    required final List<DeviceType> deviceCategory,
     required final ActionCategory actionCategory,
     final String? response,
     @Default({}) final Map<DeviceType, String> nameAlias,
@@ -133,6 +132,7 @@ class MoveList extends BaseAction with _$MoveList {
     @HiveField(3) @Default(ActionCategory.sequence) final ActionCategory actionCategory,
     @HiveField(5) @Default([]) List<Move> moves,
     @HiveField(6) @Default(1) double repeat,
+    @Default({}) final Map<DeviceType, String> nameAlias,
   }) = _MoveList;
 }
 
@@ -142,11 +142,11 @@ class EarsMoveList extends BaseAction with _$EarsMoveList {
 
   @Implements<BaseAction>()
   factory EarsMoveList({
-    @HiveField(1) required String name,
-    @HiveField(4) required final String uuid,
+    required final String name,
+    required final String uuid,
     required final List<Object> commandMoves,
-    @HiveField(2) @Default([DeviceType.ears]) List<DeviceType> deviceCategory,
-    @HiveField(3) @Default(ActionCategory.ears) final ActionCategory actionCategory,
+    required final List<DeviceType> deviceCategory,
+    required final ActionCategory actionCategory,
     @Default({}) final Map<DeviceType, String> nameAlias,
   }) = _EarsMoveList;
 }

lib/Backend/action_registry.dart

@@ -193,6 +193,8 @@ class ActionRegistry {
     EarsMoveList(
       name: "Ears Wide",
       uuid: "d8384bcf-31ed-4b5d-a25a-da3a2f96e406",
+      deviceCategory: [DeviceType.ears],
+      actionCategory: ActionCategory.ears,
       commandMoves: [
         CommandAction.hiddenEars("BOTWIST 30", "BOTWIST END"),
         Move.delay(100),
@@ -202,6 +204,8 @@ class ActionRegistry {
     EarsMoveList(
       name: "Double Right",
       uuid: "0d5a9dfa-38f2-4b09-9be1-cd36236a03b0",
+      deviceCategory: [DeviceType.ears],
+      actionCategory: ActionCategory.ears,
       commandMoves: [
         CommandAction.hiddenEars("LETWIST 20", "LETWIST END"),
         Move.delay(25),
@@ -214,6 +218,8 @@ class ActionRegistry {
     EarsMoveList(
       name: "Double Left",
       uuid: "9a6be63e-36f5-4f50-88b6-7adf2680aa5c",
+      deviceCategory: [DeviceType.ears],
+      actionCategory: ActionCategory.ears,
       commandMoves: [
         CommandAction.hiddenEars("RITWIST 20", "RITWIST END"),
         Move.delay(25),
@@ -226,6 +232,8 @@ class ActionRegistry {
     EarsMoveList(
       name: "Right Listen",
       uuid: "83590dc9-f9de-4134-bcc7-8157a62a33ef",
+      deviceCategory: [DeviceType.ears],
+      actionCategory: ActionCategory.ears,
       commandMoves: [
         CommandAction.hiddenEars("LETWIST 20", "LETWIST END"),
         CommandAction.hiddenEars("RITWIST 100", "RITWIST END"),
@@ -236,6 +244,8 @@ class ActionRegistry {
     EarsMoveList(
       name: "Left Listen",
       uuid: "007c52d3-242a-4e27-bccc-b4b737502bfb",
+      deviceCategory: [DeviceType.ears],
+      actionCategory: ActionCategory.ears,
       commandMoves: [
         CommandAction.hiddenEars("RITWIST 20", "RITWIST END"),
         CommandAction.hiddenEars("LETWIST 100", "LETWIST END"),
@@ -246,6 +256,8 @@ class ActionRegistry {
     EarsMoveList(
       name: "Flick Left",
       uuid: "769dbe84-3a6e-440d-8b20-234983d36cb6",
+      deviceCategory: [DeviceType.ears],
+      actionCategory: ActionCategory.ears,
       commandMoves: [
         CommandAction.hiddenEars("RITWIST 30", "RITWIST END"),
         Move.delay(100),
@@ -255,6 +267,8 @@ class ActionRegistry {
     EarsMoveList(
       name: "Flick Right",
       uuid: "23144b42-6d3c-4822-8510-ec03c63c7808",
+      deviceCategory: [DeviceType.ears],
+      actionCategory: ActionCategory.ears,
       commandMoves: [
         CommandAction.hiddenEars("LETWIST 30", "LETWIST END"),
         Move.delay(100),
@@ -264,6 +278,8 @@ class ActionRegistry {
     EarsMoveList(
       name: "Hewo",
       uuid: "fdaff205-0a51-46a0-a5fc-4ea283dce079",
+      deviceCategory: [DeviceType.ears],
+      actionCategory: ActionCategory.ears,
       commandMoves: [
         CommandAction.hiddenEars("LETWIST 30", "LETWIST END"),
         Move.delay(50),

lib/Backend/sensors.dart

@@ -259,13 +259,18 @@ abstract class TriggerDefinition extends ChangeNotifier implements Comparable<Tr
         if (baseAction != null && moveActions.length > 1 && ((baseAction is CommandAction && hasLegacyEars) || !baseAction.deviceCategory.toSet().containsAll(flattenedDeviceTypes))) {
           // find the missing device type
           // The goal here is if a user selects multiple moves, send a move to all gear
-          final Set<DeviceType> missingGearAction = baseAction.deviceCategory
-              .whereNot(
-                // filtering out the first actions ears entry if its a unified move but legacy gear is connected
-                (element) => (DeviceType.ears == element && (baseAction is CommandAction && hasLegacyEars)),
-              )
-              .toSet()
-              .difference(flattenedDeviceTypes);
+          final Set<DeviceType> baseActionDeviceCategories = baseAction.deviceCategory.where(
+            // filtering out the first actions ears entry if its a unified move but legacy gear is connected
+            (element) {
+              if (element == DeviceType.ears) {
+                if (baseAction is CommandAction) {
+                  return hasLegacyEars;
+                }
+              }
+              return true;
+            },
+          ).toSet();
+          final Set<DeviceType> missingGearAction = flattenedDeviceTypes.difference(baseActionDeviceCategories);
           final List<BaseAction> remainingActions = moveActions.where(
             // Check if any actions contain the device type of the gear the first action is missing
             (element) {
@@ -305,7 +310,7 @@ abstract class TriggerDefinition extends ChangeNotifier implements Comparable<Tr
 
               // tailcontrol migration
               if (element.baseDeviceDefinition.deviceType == DeviceType.ears) {
-                if (baseAction is CommandAction && element.baseDeviceDefinition.deviceType == DeviceType.ears && element.isTailCoNTROL.value == TailControlStatus.legacy) {
+                if (baseAction is CommandAction && baseAction.actionCategory != ActionCategory.glowtip && element.baseDeviceDefinition.deviceType == DeviceType.ears && element.isTailCoNTROL.value == TailControlStatus.legacy) {
                   return false;
                 } else if (baseAction is EarsMoveList && element.baseDeviceDefinition.deviceType == DeviceType.ears && element.isTailCoNTROL.value == TailControlStatus.tailControl) {
                   return false;

lib/main.dart

@@ -232,9 +232,6 @@ Future<void> initHive() async {
   if (!SentryHive.isAdapterRegistered(FavoriteActionAdapter().typeId)) {
     SentryHive.registerAdapter(FavoriteActionAdapter());
   }
-  if (!SentryHive.isAdapterRegistered(BaseActionAdapter().typeId)) {
-    SentryHive.registerAdapter(BaseActionAdapter());
-  }
   if (!SentryHive.isAdapterRegistered(EarSpeedAdapter().typeId)) {
     SentryHive.registerAdapter(EarSpeedAdapter());
   }