Skip to content

Commit 909f35a

Browse files
ThomasFarstrikeThomasFarstrike
committed
Move /apps_builtin to /builtin/apps and add /builtin/resources
1 parent 8591ba3 commit 909f35a

File tree

13 files changed

+4
-6
lines changed

13 files changed

+4
-6
lines changed

internal_filesystem/apps_builtin/com.example.launcher/META-INF/MANIFEST.MF renamed to internal_filesystem/builtin/apps/com.example.launcher/META-INF/MANIFEST.MF

File renamed without changes.

internal_filesystem/apps_builtin/com.example.launcher/assets/launcher.py renamed to internal_filesystem/builtin/apps/com.example.launcher/assets/launcher.py

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ def load_icon(icon_path):
4646

4747
# Check and collect subdirectories from existing directories
4848
apps_dir = "/apps"
49-
apps_dir_builtin = "/apps_builtin"
49+
apps_dir_builtin = "/builtin/apps"
5050
app_dirs = []
5151
seen_base_names = set()
5252

@@ -71,9 +71,7 @@ def load_icon(icon_path):
7171
pass
7272

7373
# Should we skip 'Launcher' apps from the list here?
74-
for app_dir in app_dirs:
75-
# Paths
76-
app_dir_fullpath = f"{apps_dir}/{app_dir}"
74+
for app_dir_fullpath in app_dirs:
7775
app_name, main_script = parse_manifest(f"{app_dir_fullpath}/META-INF/MANIFEST.MF")
7876
# Create a container for each app (icon + label)
7977
app_cont = lv.obj(cont)
@@ -87,7 +85,7 @@ def load_icon(icon_path):
8785
image.set_src(load_icon(icon_path))
8886
except Exception as e:
8987
print(f"Error loading icon {icon_path}: {e} - loading default icon")
90-
icon_path = "/resources/default_icon_64x64.bin"
88+
icon_path = "/builtin/resources/default_icon_64x64.bin"
9189
try:
9290
image.set_src(load_icon(icon_path))
9391
except Exception as e:

internal_filesystem/apps_builtin/com_example_appstore/META-INF/MANIFEST.MF renamed to internal_filesystem/builtin/apps/com_example_appstore/META-INF/MANIFEST.MF

File renamed without changes.

internal_filesystem/apps_builtin/com_example_appstore/assets/appstore.py renamed to internal_filesystem/builtin/apps/com_example_appstore/assets/appstore.py

File renamed without changes.

internal_filesystem/apps_builtin/com_example_appstore/res/mipmap_mdpi/icon_64x64.bin renamed to internal_filesystem/builtin/apps/com_example_appstore/res/mipmap_mdpi/icon_64x64.bin

File renamed without changes.

internal_filesystem/apps_builtin/com_example_osupdate/META-INF/MANIFEST.MF renamed to internal_filesystem/builtin/apps/com_example_osupdate/META-INF/MANIFEST.MF

File renamed without changes.

internal_filesystem/apps_builtin/com_example_osupdate/assets/osupdate.py renamed to internal_filesystem/builtin/apps/com_example_osupdate/assets/osupdate.py

File renamed without changes.

internal_filesystem/apps_builtin/com_example_osupdate/res/mipmap_mdpi/icon_64x64.bin renamed to internal_filesystem/builtin/apps/com_example_osupdate/res/mipmap_mdpi/icon_64x64.bin

File renamed without changes.

internal_filesystem/apps_builtin/com_example_wificonf/META-INF/MANIFEST.MF renamed to internal_filesystem/builtin/apps/com_example_wificonf/META-INF/MANIFEST.MF

File renamed without changes.

internal_filesystem/apps_builtin/com_example_wificonf/assets/wificonf.py renamed to internal_filesystem/builtin/apps/com_example_wificonf/assets/wificonf.py

File renamed without changes.

0 commit comments

Comments
 (0)