Merge pull request #711 from pulsar-edit/use-local-image-for-bundled-…

…packages [core & settings-view] Avoid network requests for bundled packages
pulsar-edit · Sep 16, 2023 · cd08e5f · cd08e5f
2 parents 218d26c + 9e94ca1
commit cd08e5f
Show file tree

Hide file tree

Showing 4 changed files with 56 additions and 26 deletions.
diff --git a/package.json b/package.json
@@ -14,7 +14,7 @@
   "main": "./src/main-process/main.js",
   "repository": {
     "type": "git",
-    "url": "https://github.com/pulsar-edit/pulsar.git"
+    "url": "https://github.com/pulsar-edit/pulsar"
   },
   "bugs": {
     "url": "https://github.com/pulsar-edit/pulsar/issues"

diff --git a/packages/settings-view/lib/package-card.js b/packages/settings-view/lib/package-card.js
@@ -5,8 +5,9 @@ import {CompositeDisposable, Disposable} from 'atom'
 import {shell} from 'electron'
 import etch from 'etch'
 import BadgeView from './badge-view'
+import path from 'path'
 
-import {ownerFromRepository} from './utils'
+import {ownerFromRepository, repoUrlFromRepository} from './utils'
 
 let marked = null
 
@@ -280,31 +281,39 @@ export default class PackageCard {
   }
 
   loadCachedMetadata () {
-    this.client.avatar(ownerFromRepository(this.pack.repository), (err, avatarPath) => {
-      if (!err && avatarPath) {
-        this.refs.avatar.src = `file://${avatarPath}`
-      }
-    })
-
-    this.client.package(this.pack.name, (err, data) => {
-      // We don't need to actually handle the error here, we can just skip
-      // showing the download count if there's a problem.
-      if (!err) {
-        if (data == null) {
-          data = {}
+    if (repoUrlFromRepository(this.pack.repository) === atom.branding.urlCoreRepo) {
+      // Don't hit the web for our bundled packages. Just use the local image.
+      this.refs.avatar.src = `file://${path.join(process.resourcesPath, "pulsar.png")}`;
+    } else {
+      this.client.avatar(ownerFromRepository(this.pack.repository), (err, avatarPath) => {
+        if (!err && avatarPath) {
+          this.refs.avatar.src = `file://${avatarPath}`
         }
+      })
+    }
 
-        if (this.pack.apmInstallSource && this.pack.apmInstallSource.type === 'git') {
-          this.refs.downloadIcon.classList.remove('icon-cloud-download')
-          this.refs.downloadIcon.classList.add('icon-git-branch')
-          this.refs.downloadCount.textContent = this.pack.apmInstallSource.sha.substr(0, 8)
-        } else {
-
-          this.refs.stargazerCount.textContent = data.stargazers_count ? parseInt(data.stargazers_count).toLocaleString() : ''
-          this.refs.downloadCount.textContent = data.downloads ? parseInt(data.downloads).toLocaleString() : ''
+    // We don't want to hit the API for this data, if it's a bundled package
+    if (this.pack.repository !== atom.branding.urlCoreRepo) {
+      this.client.package(this.pack.name, (err, data) => {
+        // We don't need to actually handle the error here, we can just skip
+        // showing the download count if there's a problem.
+        if (!err) {
+          if (data == null) {
+            data = {}
+          }
+
+          if (this.pack.apmInstallSource && this.pack.apmInstallSource.type === 'git') {
+            this.refs.downloadIcon.classList.remove('icon-cloud-download')
+            this.refs.downloadIcon.classList.add('icon-git-branch')
+            this.refs.downloadCount.textContent = this.pack.apmInstallSource.sha.substr(0, 8)
+          } else {
+
+            this.refs.stargazerCount.textContent = data.stargazers_count ? parseInt(data.stargazers_count).toLocaleString() : ''
+            this.refs.downloadCount.textContent = data.downloads ? parseInt(data.downloads).toLocaleString() : ''
+          }
         }
-      }
-    })
+      })
+    }
   }
 
   updateInterfaceState () {

diff --git a/packages/settings-view/lib/utils.js b/packages/settings-view/lib/utils.js
@@ -19,6 +19,26 @@ const ownerFromRepository = repository => {
   return match ? match[1] : ''
 }
 
+const repoUrlFromRepository = repository => {
+  if (!repository) return ''
+
+  let repo = repository
+
+  if (typeof repository === 'string') {
+    repo = repository
+  } else if (typeof repository === 'object' && typeof repository.url === 'string') {
+    repo = repository.url
+  } else {
+    repo = ''
+  }
+
+  if (repo.endsWith('.git')) {
+    repo = repo.replace('.git', '')
+  }
+
+  return repo
+}
+
 const packageComparatorAscending = (left, right) => {
   const leftStatus = atom.packages.isPackageDisabled(left.name)
   const rightStatus = atom.packages.isPackageDisabled(right.name)
@@ -37,4 +57,4 @@ const packageComparatorAscending = (left, right) => {
   }
 }
 
-module.exports = {ownerFromRepository, packageComparatorAscending}
+module.exports = {ownerFromRepository, repoUrlFromRepository, packageComparatorAscending}
diff --git a/src/atom-environment.js b/src/atom-environment.js
@@ -222,7 +222,8 @@ class AtomEnvironment {
       name: packagejson.branding.name,
       urlWeb: packagejson.branding.urlWeb,
       urlGH: packagejson.branding.urlGH,
-      urlForum: packagejson.branding.urlForum
+      urlForum: packagejson.branding.urlForum,
+      urlCoreRepo: packagejson.repository.url
     };
 
     // Keep instances of HistoryManager in sync