extension.js: Fix loading of versioned xlets, xlet-settings with

inactive config files.

Follow-up to 406c075 and dcc091e.

Author: mtwebster

files/usr/share/cinnamon/cinnamon-settings/xlet-settings.py

@@ -274,9 +274,15 @@ def load_instances(self):
                 instance_exists = False
                 enabled = self.gsettings.get_strv(f'enabled-{self.type}s')
                 for definition in enabled:
-                    if self.uuid in definition and instance_id in definition.split(':'):
-                        instance_exists = True
-                        break
+                    parts = definition.split(':')
+                    if self.type == "applet" and len(parts) >= 5:
+                        if parts[3] == self.uuid and parts[4] == instance_id:
+                            instance_exists = True
+                            break
+                    elif self.type == "desklet" and len(parts) >= 2:
+                        if parts[0] == self.uuid and parts[1] == instance_id:
+                            instance_exists = True
+                            break
 
                 if not instance_exists:
                     continue

js/ui/extension.js

@@ -297,23 +297,39 @@ function installXletImporter(extension) {
     // extension.dir is the actual directory containing the JS files,
     // which might be a versioned subdirectory (e.g., .../uuid/6.0/)
     // or the uuid directory itself for non-versioned xlets.
-    let parentPath = extension.dir.get_parent().get_path();
     let dirName = extension.dir.get_basename();
+    let uuidDir = extension.dir.get_parent();
+    let parentPath, importPath;
+
+    // Versioned subdirectories (e.g., "6.2") start with a digit and
+    // can't be used as importer keys directly. Navigate through the
+    // uuid directory instead.
+    if (dirName.match(/^[0-9]/)) {
+        parentPath = uuidDir.get_parent().get_path();
+        importPath = [uuidDir.get_basename(), dirName];
+    } else {
+        parentPath = uuidDir.get_path();
+        importPath = [dirName];
+    }
 
     let oldSearchPath = imports.searchPath.slice();
     imports.searchPath = [parentPath];
 
     try {
-        extension.imports = imports[dirName];
+        let importer = imports;
+        for (let part of importPath) {
+            importer = importer[part];
+        }
+        extension.imports = importer;
     } catch (e) {
         imports.searchPath = oldSearchPath;
-        throw new Error(`Failed to create importer for ${extension.uuid} at ${parentPath}/${dirName}: ${e.message}`);
+        throw new Error(`Failed to create importer for ${extension.uuid} at ${parentPath}/${importPath.join('/')}: ${e.message}`);
     }
 
     imports.searchPath = oldSearchPath;
 
     if (!extension.imports) {
-        throw new Error(`Importer is null for ${extension.uuid} at ${parentPath}/${dirName}`);
+        throw new Error(`Importer is null for ${extension.uuid} at ${parentPath}/${importPath.join('/')}`);
     }
 }