mirror of
https://github.com/python-kasa/python-kasa.git
synced 2024-12-22 03:03:35 +00:00
Enable saving of fixture files without git clone (#1375)
Some checks are pending
CI / Perform linting checks (3.13) (push) Waiting to run
CI / Python ${{ matrix.python-version}} on ${{ matrix.os }}${{ fromJSON('[" (extras)", ""]')[matrix.extras == ''] }} (false, macos-latest, 3.11) (push) Blocked by required conditions
CI / Python ${{ matrix.python-version}} on ${{ matrix.os }}${{ fromJSON('[" (extras)", ""]')[matrix.extras == ''] }} (false, macos-latest, 3.12) (push) Blocked by required conditions
CI / Python ${{ matrix.python-version}} on ${{ matrix.os }}${{ fromJSON('[" (extras)", ""]')[matrix.extras == ''] }} (false, macos-latest, 3.13) (push) Blocked by required conditions
CI / Python ${{ matrix.python-version}} on ${{ matrix.os }}${{ fromJSON('[" (extras)", ""]')[matrix.extras == ''] }} (false, ubuntu-latest, 3.11) (push) Blocked by required conditions
CI / Python ${{ matrix.python-version}} on ${{ matrix.os }}${{ fromJSON('[" (extras)", ""]')[matrix.extras == ''] }} (false, ubuntu-latest, 3.12) (push) Blocked by required conditions
CI / Python ${{ matrix.python-version}} on ${{ matrix.os }}${{ fromJSON('[" (extras)", ""]')[matrix.extras == ''] }} (false, ubuntu-latest, 3.13) (push) Blocked by required conditions
CI / Python ${{ matrix.python-version}} on ${{ matrix.os }}${{ fromJSON('[" (extras)", ""]')[matrix.extras == ''] }} (false, windows-latest, 3.11) (push) Blocked by required conditions
CI / Python ${{ matrix.python-version}} on ${{ matrix.os }}${{ fromJSON('[" (extras)", ""]')[matrix.extras == ''] }} (false, windows-latest, 3.12) (push) Blocked by required conditions
CI / Python ${{ matrix.python-version}} on ${{ matrix.os }}${{ fromJSON('[" (extras)", ""]')[matrix.extras == ''] }} (false, windows-latest, 3.13) (push) Blocked by required conditions
CI / Python ${{ matrix.python-version}} on ${{ matrix.os }}${{ fromJSON('[" (extras)", ""]')[matrix.extras == ''] }} (true, ubuntu-latest, 3.11) (push) Blocked by required conditions
CI / Python ${{ matrix.python-version}} on ${{ matrix.os }}${{ fromJSON('[" (extras)", ""]')[matrix.extras == ''] }} (true, ubuntu-latest, 3.12) (push) Blocked by required conditions
CI / Python ${{ matrix.python-version}} on ${{ matrix.os }}${{ fromJSON('[" (extras)", ""]')[matrix.extras == ''] }} (true, ubuntu-latest, 3.13) (push) Blocked by required conditions
CodeQL checks / Analyze (python) (push) Waiting to run
Some checks are pending
CI / Perform linting checks (3.13) (push) Waiting to run
CI / Python ${{ matrix.python-version}} on ${{ matrix.os }}${{ fromJSON('[" (extras)", ""]')[matrix.extras == ''] }} (false, macos-latest, 3.11) (push) Blocked by required conditions
CI / Python ${{ matrix.python-version}} on ${{ matrix.os }}${{ fromJSON('[" (extras)", ""]')[matrix.extras == ''] }} (false, macos-latest, 3.12) (push) Blocked by required conditions
CI / Python ${{ matrix.python-version}} on ${{ matrix.os }}${{ fromJSON('[" (extras)", ""]')[matrix.extras == ''] }} (false, macos-latest, 3.13) (push) Blocked by required conditions
CI / Python ${{ matrix.python-version}} on ${{ matrix.os }}${{ fromJSON('[" (extras)", ""]')[matrix.extras == ''] }} (false, ubuntu-latest, 3.11) (push) Blocked by required conditions
CI / Python ${{ matrix.python-version}} on ${{ matrix.os }}${{ fromJSON('[" (extras)", ""]')[matrix.extras == ''] }} (false, ubuntu-latest, 3.12) (push) Blocked by required conditions
CI / Python ${{ matrix.python-version}} on ${{ matrix.os }}${{ fromJSON('[" (extras)", ""]')[matrix.extras == ''] }} (false, ubuntu-latest, 3.13) (push) Blocked by required conditions
CI / Python ${{ matrix.python-version}} on ${{ matrix.os }}${{ fromJSON('[" (extras)", ""]')[matrix.extras == ''] }} (false, windows-latest, 3.11) (push) Blocked by required conditions
CI / Python ${{ matrix.python-version}} on ${{ matrix.os }}${{ fromJSON('[" (extras)", ""]')[matrix.extras == ''] }} (false, windows-latest, 3.12) (push) Blocked by required conditions
CI / Python ${{ matrix.python-version}} on ${{ matrix.os }}${{ fromJSON('[" (extras)", ""]')[matrix.extras == ''] }} (false, windows-latest, 3.13) (push) Blocked by required conditions
CI / Python ${{ matrix.python-version}} on ${{ matrix.os }}${{ fromJSON('[" (extras)", ""]')[matrix.extras == ''] }} (true, ubuntu-latest, 3.11) (push) Blocked by required conditions
CI / Python ${{ matrix.python-version}} on ${{ matrix.os }}${{ fromJSON('[" (extras)", ""]')[matrix.extras == ''] }} (true, ubuntu-latest, 3.12) (push) Blocked by required conditions
CI / Python ${{ matrix.python-version}} on ${{ matrix.os }}${{ fromJSON('[" (extras)", ""]')[matrix.extras == ''] }} (true, ubuntu-latest, 3.13) (push) Blocked by required conditions
CodeQL checks / Analyze (python) (push) Waiting to run
Allows `dump_devinfo` to be run without fixture subfolders present from cloned repository
This commit is contained in:
parent
d03a387a74
commit
5918e4daa7
@ -57,13 +57,20 @@ from kasa.smart import SmartChildDevice, SmartDevice
|
|||||||
from kasa.smartcam import SmartCamDevice
|
from kasa.smartcam import SmartCamDevice
|
||||||
|
|
||||||
Call = namedtuple("Call", "module method")
|
Call = namedtuple("Call", "module method")
|
||||||
FixtureResult = namedtuple("FixtureResult", "filename, folder, data")
|
FixtureResult = namedtuple("FixtureResult", "filename, folder, data, protocol_suffix")
|
||||||
|
|
||||||
SMART_FOLDER = "tests/fixtures/smart/"
|
SMART_FOLDER = "tests/fixtures/smart/"
|
||||||
SMARTCAM_FOLDER = "tests/fixtures/smartcam/"
|
SMARTCAM_FOLDER = "tests/fixtures/smartcam/"
|
||||||
SMART_CHILD_FOLDER = "tests/fixtures/smart/child/"
|
SMART_CHILD_FOLDER = "tests/fixtures/smart/child/"
|
||||||
IOT_FOLDER = "tests/fixtures/iot/"
|
IOT_FOLDER = "tests/fixtures/iot/"
|
||||||
|
|
||||||
|
SMART_PROTOCOL_SUFFIX = "SMART"
|
||||||
|
SMARTCAM_SUFFIX = "SMARTCAM"
|
||||||
|
SMART_CHILD_SUFFIX = "SMART.CHILD"
|
||||||
|
IOT_SUFFIX = "IOT"
|
||||||
|
|
||||||
|
NO_GIT_FIXTURE_FOLDER = "kasa-fixtures"
|
||||||
|
|
||||||
ENCRYPT_TYPES = [encrypt_type.value for encrypt_type in DeviceEncryptionType]
|
ENCRYPT_TYPES = [encrypt_type.value for encrypt_type in DeviceEncryptionType]
|
||||||
|
|
||||||
_LOGGER = logging.getLogger(__name__)
|
_LOGGER = logging.getLogger(__name__)
|
||||||
@ -140,7 +147,17 @@ async def handle_device(
|
|||||||
]
|
]
|
||||||
|
|
||||||
for fixture_result in fixture_results:
|
for fixture_result in fixture_results:
|
||||||
save_filename = Path(basedir) / fixture_result.folder / fixture_result.filename
|
save_folder = Path(basedir) / fixture_result.folder
|
||||||
|
if save_folder.exists():
|
||||||
|
save_filename = save_folder / f"{fixture_result.filename}.json"
|
||||||
|
else:
|
||||||
|
# If being run without git clone
|
||||||
|
save_folder = Path(basedir) / NO_GIT_FIXTURE_FOLDER
|
||||||
|
save_folder.mkdir(exist_ok=True)
|
||||||
|
save_filename = (
|
||||||
|
save_folder
|
||||||
|
/ f"{fixture_result.filename}-{fixture_result.protocol_suffix}.json"
|
||||||
|
)
|
||||||
|
|
||||||
pprint(fixture_result.data)
|
pprint(fixture_result.data)
|
||||||
if autosave:
|
if autosave:
|
||||||
@ -459,9 +476,14 @@ async def get_legacy_fixture(
|
|||||||
hw_version = sysinfo["hw_ver"]
|
hw_version = sysinfo["hw_ver"]
|
||||||
sw_version = sysinfo["sw_ver"]
|
sw_version = sysinfo["sw_ver"]
|
||||||
sw_version = sw_version.split(" ", maxsplit=1)[0]
|
sw_version = sw_version.split(" ", maxsplit=1)[0]
|
||||||
save_filename = f"{model}_{hw_version}_{sw_version}.json"
|
save_filename = f"{model}_{hw_version}_{sw_version}"
|
||||||
copy_folder = IOT_FOLDER
|
copy_folder = IOT_FOLDER
|
||||||
return FixtureResult(filename=save_filename, folder=copy_folder, data=final)
|
return FixtureResult(
|
||||||
|
filename=save_filename,
|
||||||
|
folder=copy_folder,
|
||||||
|
data=final,
|
||||||
|
protocol_suffix=IOT_SUFFIX,
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
def _echo_error(msg: str):
|
def _echo_error(msg: str):
|
||||||
@ -830,9 +852,12 @@ def get_smart_child_fixture(response):
|
|||||||
model = model_info.long_name
|
model = model_info.long_name
|
||||||
if model_info.region is not None:
|
if model_info.region is not None:
|
||||||
model = f"{model}({model_info.region})"
|
model = f"{model}({model_info.region})"
|
||||||
save_filename = f"{model}_{hw_version}_{fw_version}.json"
|
save_filename = f"{model}_{hw_version}_{fw_version}"
|
||||||
return FixtureResult(
|
return FixtureResult(
|
||||||
filename=save_filename, folder=SMART_CHILD_FOLDER, data=response
|
filename=save_filename,
|
||||||
|
folder=SMART_CHILD_FOLDER,
|
||||||
|
data=response,
|
||||||
|
protocol_suffix=SMART_CHILD_SUFFIX,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
@ -980,20 +1005,28 @@ async def get_smart_fixtures(
|
|||||||
# smart protocol
|
# smart protocol
|
||||||
model_info = SmartDevice._get_device_info(final, discovery_result)
|
model_info = SmartDevice._get_device_info(final, discovery_result)
|
||||||
copy_folder = SMART_FOLDER
|
copy_folder = SMART_FOLDER
|
||||||
|
protocol_suffix = SMART_PROTOCOL_SUFFIX
|
||||||
else:
|
else:
|
||||||
# smart camera protocol
|
# smart camera protocol
|
||||||
model_info = SmartCamDevice._get_device_info(final, discovery_result)
|
model_info = SmartCamDevice._get_device_info(final, discovery_result)
|
||||||
copy_folder = SMARTCAM_FOLDER
|
copy_folder = SMARTCAM_FOLDER
|
||||||
|
protocol_suffix = SMARTCAM_SUFFIX
|
||||||
hw_version = model_info.hardware_version
|
hw_version = model_info.hardware_version
|
||||||
sw_version = model_info.firmware_version
|
sw_version = model_info.firmware_version
|
||||||
model = model_info.long_name
|
model = model_info.long_name
|
||||||
if model_info.region is not None:
|
if model_info.region is not None:
|
||||||
model = f"{model}({model_info.region})"
|
model = f"{model}({model_info.region})"
|
||||||
|
|
||||||
save_filename = f"{model}_{hw_version}_{sw_version}.json"
|
save_filename = f"{model}_{hw_version}_{sw_version}"
|
||||||
|
|
||||||
fixture_results.insert(
|
fixture_results.insert(
|
||||||
0, FixtureResult(filename=save_filename, folder=copy_folder, data=final)
|
0,
|
||||||
|
FixtureResult(
|
||||||
|
filename=save_filename,
|
||||||
|
folder=copy_folder,
|
||||||
|
data=final,
|
||||||
|
protocol_suffix=protocol_suffix,
|
||||||
|
),
|
||||||
)
|
)
|
||||||
return fixture_results
|
return fixture_results
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user