feat: set Devel manifest as default manifest if any

Closes #224
bilelmoussaoui · Nov 9, 2023 · 1535b98 · 1535b98
1 parent 92c7acc
commit 1535b98
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 8 deletions.
diff --git a/src/manifestManager.ts b/src/manifestManager.ts
@@ -87,18 +87,16 @@ export class ManifestManager implements vscode.Disposable {
             lastActiveManifestUri = undefined
         }
 
-        const manifests = await this.getManifests()
-
         if (lastActiveManifestUri === undefined) {
-            // If there is only one manifest to select, select it automatically.
-            const firstManifest = manifests.getFirstItem()
-            if (manifests.size() === 1 && firstManifest) {
-                console.log(`Found only one valid manifest. Setting active manifest to ${firstManifest.uri.fsPath}`)
-                await this.setActiveManifest(firstManifest, true)
+            const defaultManifest = await this.findDefaultManifest()
+            if (defaultManifest !== undefined) {
+                console.log(`Manifest set as default at ${defaultManifest.uri.fsPath}`)
+                await this.setActiveManifest(defaultManifest, true)
             }
             return
         }
 
+        const manifests = await this.getManifests()
         const lastActiveManifest = manifests.get(lastActiveManifestUri)
         if (lastActiveManifest === undefined) {
             return
@@ -108,6 +106,27 @@ export class ManifestManager implements vscode.Disposable {
         await this.setActiveManifest(lastActiveManifest, true)
     }
 
+    async findDefaultManifest(): Promise<Manifest | undefined> {
+        const manifests = await this.getManifests()
+
+        // If there is only one manifest to select, select it automatically.
+        const firstManifest = manifests.getFirstItem()
+        if (manifests.size() === 1 && firstManifest) {
+            console.log('Found only one valid manifest')
+            return firstManifest
+        }
+
+        // If some manifest contains '.Devel.' in its filename, select it automatically.
+        for (const manifest of manifests) {
+            if (manifest.uri.fsPath.includes('.Devel.')) {
+                console.log('Found a manifest that contains ".Devel." in its filename')
+                return manifest
+            }
+        }
+
+        return undefined
+    }
+
     async getManifests(): Promise<ManifestMap> {
         if (this.manifests === undefined) {
             console.log('Looking for potential Flatpak manifests')

diff --git a/src/manifestMap.ts b/src/manifestMap.ts
@@ -1,7 +1,7 @@
 import { Manifest } from './manifest'
 import * as vscode from 'vscode'
 
-export class ManifestMap {
+export class ManifestMap implements Iterable<Manifest> {
     private readonly inner: Map<string, Manifest>
 
     private readonly _onDidItemsChanged = new vscode.EventEmitter<void>()
@@ -11,6 +11,10 @@ export class ManifestMap {
         this.inner = new Map()
     }
 
+    [Symbol.iterator](): IterableIterator<Manifest> {
+        return this.inner.values()
+    }
+
     add(manifest: Manifest): void {
         this.inner.set(manifest.uri.fsPath, manifest)
         this._onDidItemsChanged.fire()