Merge branch 'master' of github.com:kidneyhex/EspruinoAppLoaderCore into kidneyhex-master

Author: gfwilliams

js/index.js

@@ -99,6 +99,48 @@ function appJSONLoadedHandler() {
   });
 }
 
+/**
+ * Extract an app name from a /apps/appname path
+ *   - assumes app names cannot contain periods
+ *   - assumes apps cannot be named "apps"
+ *   - assumes we're in or including the "apps" folder in the href
+ * Returns the app name string or null if not an app folder.
+ */
+function extractAppNameFromHref(href) {
+  if (!href) return null;
+  
+  try {
+    const u = new URL(href);
+    href = u.pathname;
+  } catch (e) {
+    // ignore - just use href as-is
+  }
+  // very unlikely, but get rid of query/hash
+  href = href.split('?')[0].split('#')[0].trim();
+  // remove leading/trailing slashes
+  href = href.replace(/^\/+|\/+$/g, '');
+  if (!href) return null; // was just /, throw it out
+  
+  const parts = href.split('/').filter(Boolean);
+  if (parts.length === 0) return null;
+  // allow './' prefixes by dropping leading '.' segments
+  while (parts.length && parts[0] === '.') parts.shift();
+  if (parts.length === 0) return null; // skip if it was current dir only
+  // reject any parent-directory references anywhere
+  if (parts.some(p => p === '..')) return null;
+  // prefer an 'apps' segment anywhere in the path; otherwise use first folder
+  const appsIdx = parts.findIndex(p => p.toLowerCase() === 'apps');
+  let candidate;
+  if (appsIdx >= 0 && appsIdx + 1 < parts.length) candidate = parts[appsIdx + 1];
+  else candidate = parts[0];
+  if (!candidate) return null;
+  // if the only thing we found is 'apps', ignore it
+  if (candidate.toLowerCase() === 'apps') return null;
+  // skip names with periods
+  if (candidate.includes('.')) return null;
+  return candidate;
+}
+
 httpGet(Const.APPS_JSON_FILE).then(apps=>{
   if (apps.startsWith("---")) {
     showToast(Const.APPS_JSON_FILE+" still contains Jekyll markup","warning");
@@ -127,8 +169,12 @@ httpGet(Const.APPS_JSON_FILE).then(apps=>{
     let promises = [];
     htmlToArray(xmlDoc.querySelectorAll("a")).forEach(a=>{
       let href = a.getAttribute("href");
-      if (!href || href.startsWith("/") || href.startsWith("_") || !href.endsWith("/")) return;
-      let metadataURL = appsURL+"/"+href+"metadata.json";
+      const appName = extractAppNameFromHref(href);
+      // Skip anything that doesn't look like an app or is an _example_app
+      if (!appName || appName.startsWith("_")) {
+        return;
+      }
+      let metadataURL = appsURL+appName+"/metadata.json";
       console.log(" - Loading "+metadataURL);
       promises.push(httpGet(metadataURL).then(metadataText=>{
         try {