Public/automatic
1
0
Fork 0
mirror of https://github.com/vladmandic/automatic synced 2026-09-17 16:24:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4504 from awsr/read-update

Browse Source 
Add warning messages on type mismatch and fix default
This commit is contained in:
Vladimir Mandic
2025-12-28 15:05:00 +01:00
committed by GitHub
parent 259a38a2ed 7c01fd71de
commit a392e2ff73
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/json_helpers.py
+7 -1
View File
@@ -19,7 +19,7 @@ def readfile(filename: str, silent: bool = False, lock: bool = False, *, as_type
def readfile(filename: str, silent: bool = False, lock: bool = False) -> dict | list: ...
def readfile(filename: str, silent: bool = False, lock: bool = False, *, as_type="") -> dict | list:
global locking_available # pylint: disable=global-statement
data = {}
data = {} if as_type == "dict" else []
lock_file = None
locked = False
if lock and locking_available:
@@ -59,11 +59,17 @@ def readfile(filename: str, silent: bool = False, lock: bool = False, *, as_type
except Exception:
locking_available = False
if isinstance(data, list) and as_type == "dict":
if not data:
return {}
log.warning(f"Read: Expected dictionary from '{filename}' but got list")
data0 = data[0]
if isinstance(data0, dict):
return data0
return {}
if isinstance(data, dict) and as_type == "list":
if not data:
return []
log.warning(f"Read: Expected list from '{filename}' but got dictionary")
return [data]
return data