Skip to content

Commit

Permalink
[Renderer/LcdPicon]
Browse files Browse the repository at this point in the history
* improve path search

Prefer piconlcd if exists but only if not empty.
  • Loading branch information
jbleyel committed Dec 9, 2023
1 parent b657f36 commit c5c0261
Showing 1 changed file with 11 additions and 8 deletions.
19 changes: 11 additions & 8 deletions lib/python/Components/Renderer/LcdPicon.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,13 @@ def onMountpointAdded(mountpoint):
try:
if BW or isdir(mountpoint + "piconlcd"):
path = join(mountpoint, "piconlcd", "")
else:
path = join(mountpoint, "picon", "")
if isdir(path) and path not in searchPaths:
for fn in listdir(path):
if fn.endswith(".png"):
print(f"[LcdPicon] adding path: {path}")
searchPaths.append(path)
return
path = join(mountpoint, "picon", "")
if isdir(path) and path not in searchPaths:
for fn in listdir(path):
if fn.endswith(".png"):
Expand All @@ -45,13 +50,11 @@ def onMountpointAdded(mountpoint):

def onMountpointRemoved(mountpoint):
global searchPaths
if BW or isdir(mountpoint + "piconlcd"):
path = join(mountpoint, "piconlcd", "")
else:
path = join(mountpoint, "picon", "")
try:
searchPaths.remove(path)
print(f"[LcdPicon] removed path: {path}")
for path in [join(mountpoint, directory, "") for directory in ("piconlcd", "picon")]:
if path in searchPaths:
searchPaths.remove(path)
print(f"[LcdPicon] removed path: {path}")
except Exception:
pass

Expand Down

0 comments on commit c5c0261

Please sign in to comment.