Some fixes

arononak · Aug 2, 2024 · 2e7ec48 · 2e7ec48
1 parent ae7bb67
commit 2e7ec48
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 18 deletions.
diff --git a/[email protected]/extension.js b/[email protected]/extension.js
@@ -72,9 +72,10 @@ export default class GithubActionsExtension extends Extension {
                 onBuildCompleted: (owner, repo, conclusion) => {
                     NotificationController.showCompletedBuild(owner, repo, conclusion)
                 },
-                onReloadCallback: () => {
+                onReloadCallback: async () => {
                     this.extensionController.stopRefreshing()
                     this.disposeExtension()
+                    await new Promise((resolve) => setTimeout(resolve, 2000))
                     this.initExtension()
                     this.extensionController.startRefreshing()
                 },

diff --git a/[email protected]/lib/extension_controller.js b/[email protected]/lib/extension_controller.js
@@ -168,23 +168,23 @@ export class ExtensionController {
         }
     }
 
-    refresh() {
+    async refresh() {
         if (this.indicator === null || this.indicator === undefined) {
             return
         }
 
         this.indicator.initMenu()
 
         try {
-            this._checkErrors()
-            this._fetchStatus()
-            this._fetchData()
+            await this._checkErrors()
+            await this._fetchStatus()
+            await this._fetchData()
         } catch (error) {
             logError(error)
         }
     }
 
-    startRefreshing() {
+    async startRefreshing() {
         if (this.isStarted === true) {
             return
         }
@@ -194,11 +194,13 @@ export class ExtensionController {
         this.observeSettings(this.settingsRepository)
 
         try {
-            const settingsRepository = this.settingsRepository
-            this.refresh()
+            await new Promise((resolve) => setTimeout(resolve, 2000))
+            await this.refresh()
+            await new Promise((resolve) => setTimeout(resolve, 5000))
 
+            const settingsRepository = this.settingsRepository
             this.stateRefreshInterval = setInterval(() => this._checkErrors(), 1 * 1000)
-            this.githubActionsRefreshInterval = setInterval(() => this._fetchStatus(), settingsRepository.fetchRefreshTime() * 1000)
+            this.statusRefreshInterval = setInterval(() => this._fetchStatus(), settingsRepository.fetchRefreshTime() * 1000)
             this.dataRefreshInterval = setInterval(() => this._fetchData(), settingsRepository.fetchRefreshFullUpdateTime() * 60 * 1000)
         } catch (error) {
             logError(error)
@@ -217,8 +219,8 @@ export class ExtensionController {
         clearInterval(this.stateRefreshInterval)
         this.stateRefreshInterval = null
 
-        clearInterval(this.githubActionsRefreshInterval)
-        this.githubActionsRefreshInterval = null
+        clearInterval(this.statusRefreshInterval)
+        this.statusRefreshInterval = null
 
         clearInterval(this.dataRefreshInterval)
         this.dataRefreshInterval = null
@@ -408,7 +410,7 @@ export class ExtensionController {
         }
     }
 
-    _checkErrors() {
+    async _checkErrors() {
         if (this.indicator == undefined) {
             return
         }
@@ -422,7 +424,7 @@ export class ExtensionController {
             return
         }
 
-        this.extensionRepository.checkErrors({
+        await this.extensionRepository.checkErrors({
             onNotInstalledCli: () => {
                 this.indicator.setState({ state: ExtensionState.NOT_INSTALLED_CLI, forceUpdate: true })
             },
@@ -439,7 +441,7 @@ export class ExtensionController {
         })
     }
 
-    _fetchStatus() {
+    async _fetchStatus() {
         if (this.indicator == undefined) {
             return
         }
@@ -454,7 +456,7 @@ export class ExtensionController {
 
         const { owner, repo } = this.settingsRepository.ownerAndRepo()
 
-        this.extensionRepository.fetchStatus({
+        await this.extensionRepository.fetchStatus({
             owner,
             repo,
             onNoInternet: () => {
@@ -518,7 +520,7 @@ export class ExtensionController {
             this.indicator.initMenu()
         }
 
-        this.extensionRepository.fetchData({
+        await this.extensionRepository.fetchData({
             type,
             settingsRepository: this.settingsRepository,
             onUserDownloaded: (userObject) => {

diff --git a/[email protected]/lib/file_controller.js b/[email protected]/lib/file_controller.js
@@ -27,8 +27,10 @@ export class FileController {
         try {
             const [success, content] = GLib.file_get_contents(`${this.extensionDir()}/${filename}`)
 
+
             if (success) {
-                return content.toString()
+                const decoder = new TextDecoder(`utf-8`)
+                return decoder.decode(content)
             }
 
             return null

diff --git a/[email protected]/lib/status_bar_indicator.js b/[email protected]/lib/status_bar_indicator.js
@@ -1018,6 +1018,7 @@ export class StatusBarIndicator extends PanelMenu.Button {
                 "text": e[`name`].slice(0, textLengthLimiter),
                 "callback": () => openUrl(repositoryUrl),
                 "endIconName": e[`protected`] ? `changes-prevent-symbolic` : `network-workgroup-symbolic`,
+                "endIconCallback": () => {}
             }
         }
 

diff --git a/[email protected]/lib/version.js b/[email protected]/lib/version.js
@@ -1 +1 @@
-export const VERSION = `3.39.0`
+export const VERSION = `3.40.0`
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		export const VERSION = `3.39.0`
		export const VERSION = `3.40.0`