From 791308d8e88d2f849542f3321b24300d224f6afb Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Thu, 12 Nov 2020 21:00:07 +0100 Subject: [PATCH] modify hid when create the snapshot --- ereuse_devicehub/resources/action/views.py | 4 ++++ ereuse_devicehub/resources/device/sync.py | 1 - 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/ereuse_devicehub/resources/action/views.py b/ereuse_devicehub/resources/action/views.py index 2d71b4fd..17fd07a0 100644 --- a/ereuse_devicehub/resources/action/views.py +++ b/ereuse_devicehub/resources/action/views.py @@ -13,6 +13,7 @@ from teal.marshmallow import ValidationError from teal.resource import View from ereuse_devicehub.db import db +from ereuse_devicehub.resources.device.models import Device, Computer from ereuse_devicehub.resources.action.models import Action, RateComputer, Snapshot, VisualTest, \ InitTransfer from ereuse_devicehub.resources.action.rate.v1_0 import CannotRate @@ -99,6 +100,7 @@ class ActionView(View): action = Action.query.filter_by(id=id).one() return self.schema.jsonify(action) + def snapshot(self, snapshot_json: dict, resource_def): """Performs a Snapshot. @@ -112,6 +114,8 @@ class ActionView(View): components = None if snapshot_json['software'] == (SnapshotSoftware.Workbench or SnapshotSoftware.WorkbenchAndroid): components = snapshot_json.pop('components', None) # type: List[Component] + if isinstance(device, Computer) and device.hid: + device.add_mac_to_hid(components_snap=components) snapshot = Snapshot(**snapshot_json) # Remove new actions from devices so they don't interfere with sync diff --git a/ereuse_devicehub/resources/device/sync.py b/ereuse_devicehub/resources/device/sync.py index bb32e7f4..32aa8843 100644 --- a/ereuse_devicehub/resources/device/sync.py +++ b/ereuse_devicehub/resources/device/sync.py @@ -72,7 +72,6 @@ class Sync: # We only want to perform Add/Remove to not new components actions = self.add_remove(db_device, not_new_components) db_device.components = db_components - db_device.add_mac_to_hid() return db_device, actions def execute_register_component(self,