Merge pull request #24 from swsnr/23-refresh-after-switching-source

Refresh immediately if source changed

src/extension.ts

@@ -122,6 +122,9 @@ class EnabledExtension implements Destructible {
       (_selector, source): undefined => {
         this.updateDownloader();
         this.indicator.updateSelectedSource(source.metadata);
+        // Refresh immediately; the source only ever changes when the user
+        // explicitly asked for it to change.
+        this.refreshAfterUserAction();
       },
     );
 
@@ -168,11 +171,7 @@ class EnabledExtension implements Destructible {
     });
     this.indicator.connect("activated::refresh", () => {
       console.log("Refresh emitted");
-      this.refreshService.refresh().catch((error) => {
-        // For any refresh triggered manually we always show any error, including
-        // network errors.
-        this.errorHandler.showError(error);
-      });
+      this.refreshAfterUserAction();
     });
     this.indicator.connect("activated::cancel-refresh", () => {
       void this.refreshService.cancelRefresh();
@@ -203,6 +202,18 @@ class EnabledExtension implements Destructible {
     );
   }
 
+  /**
+   * Trigger an immediate refresh after a user action.
+   *
+   * Unlike scheduled refreshes we immediately show all errors, and do not handle
+   * intermittent network errors in any special way.
+   */
+  private refreshAfterUserAction(): void {
+    this.refreshService.refresh().catch((error) => {
+      this.errorHandler.showError(error);
+    });
+  }
+
   /**
    * Get the base directories this extension should use for storage.
    *

src/lib/services/source-selector.ts

@@ -61,8 +61,10 @@ export class SourceSelector
   }
 
   selectSource(key: string): void {
-    this._selectedSource = findSourceByKey(key);
-    this.emit("source-changed", this._selectedSource);
+    if (this._selectedSource.metadata.key !== key) {
+      this._selectedSource = findSourceByKey(key);
+      this.emit("source-changed", this._selectedSource);
+    }
   }
 
   get selectedSource(): Source {