Skip to content

Commit

Permalink
NEWDEV_replace_preset_icon
Browse files Browse the repository at this point in the history
  • Loading branch information
jokob-sk committed Dec 1, 2024
1 parent d4837c8 commit 826bd8f
Show file tree
Hide file tree
Showing 2 changed files with 39 additions and 4 deletions.
28 changes: 28 additions & 0 deletions front/plugins/newdev_template/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -265,6 +265,34 @@
}
]
},
{
"function": "replace_preset_icon",
"type": {
"dataType": "boolean",
"elements": [
{
"elementType": "input",
"elementOptions": [{ "type": "checkbox" }],
"transformers": []
}
]
},
"default_value": false,
"options": [],
"localized": ["name", "description"],
"name": [
{
"language_code": "en_us",
"string": "Overwrite Preset Icon"
}
],
"description": [
{
"language_code": "en_us",
"string": "If checked, the application replaces the preset icon in <code>NEWDEV_devIcon</code> with a pre-assigned vendor or device icon if found. If this is checked, avoid manually assigning this icon to devices, as it may be replaced."
}
]
},
{
"function": "devMac",
"type": {
Expand Down
15 changes: 11 additions & 4 deletions server/device.py
Original file line number Diff line number Diff line change
Expand Up @@ -452,11 +452,18 @@ def update_devices_data_from_scan (db):

# Guess ICONS
recordsToUpdate = []
query = """SELECT * FROM Devices
WHERE devIcon in ('', 'null')
OR devIcon IS NULL"""

default_icon = get_setting_value('NEWDEV_devIcon')


if get_setting_value('NEWDEV_replace_preset_icon'):
query = f"""SELECT * FROM Devices
WHERE devIcon in ('', 'null', '{default_icon}')
OR devIcon IS NULL"""
else:
query = """SELECT * FROM Devices
WHERE devIcon in ('', 'null')
OR devIcon IS NULL"""

for device in sql.execute (query) :
# Conditional logic for devIcon guessing
devIcon = guess_icon(device['devVendor'], device['devMac'], device['devLastIP'], device['devName'], default_icon)
Expand Down

0 comments on commit 826bd8f

Please sign in to comment.