Merge branch 'master' into show-folder-sizes

stevennoto · stevennoto · commit 49128b8f1071 · 2018-10-04T23:45:24.000-05:00
# Conflicts:
#	src/inject.js
diff --git a/manifest.json b/manifest.json
@@ -1,6 +1,6 @@
 {
   "name": "GitHub Repository Size",
-  "version": "0.3.2",
+  "version": "0.4.1",
   "manifest_version": 2,
   "description": "Automatically adds repository size to GitHub's repository summary",
   "homepage_url": "https://github.com/harshjv/github-repo-size",
@@ -11,18 +11,18 @@
     "128": "icons/ghrs128.png"
   },
   "permissions": [
-    "http://github.com/*",
-    "https://github.com/*",
-    "storage"
+    "storage",
+    "activeTab"
   ],
   "background" : {
-    "scripts" : [ "src/background.js" ]
+    "scripts" : [
+      "src/background.js"
+    ]
   },
   "content_scripts": [
     {
       "matches": [
-        "http://github.com/*",
-        "https://github.com/*"
+        "*://github.com/*"
       ],
       "js": [
         "src/inject.js"
diff --git a/src/background.js b/src/background.js
@@ -3,25 +3,27 @@
 const GITHUB_TOKEN_KEY = 'x-github-token'
 const TOKEN_FEATURE_INFORMATION_KEY = 'user-knows-token-feature'
 
-const setGithubToken = (key, cb) => {
+const storage = chrome.storage.sync || chrome.storage.local
+
+function setGithubToken (key, cb) {
   const obj = {}
 
   obj[GITHUB_TOKEN_KEY] = key
 
-  chrome.storage.sync.set(obj, () => {
+  storage.set(obj, function () {
     alert('Your Github token has been set successfully. Reload the Github page to see changes.')
 
     cb()
   })
 }
 
-const handleOldGithubToken = (cb) => {
-  chrome.storage.sync.get(GITHUB_TOKEN_KEY, (storedData) => {
+function handleOldGithubToken (cb) {
+  storage.get(GITHUB_TOKEN_KEY, function (storedData) {
     const oldGithubToken = storedData[GITHUB_TOKEN_KEY]
 
     if (oldGithubToken) {
       if (confirm('You have already set your Github token. Do you want to remove it?')) {
-        chrome.storage.sync.remove(GITHUB_TOKEN_KEY, () => {
+        storage.remove(GITHUB_TOKEN_KEY, function () {
           alert('You have successfully removed Github token. Click extension icon again to set a new token.')
 
           cb(false)
@@ -39,11 +41,11 @@ const userNowKnowsAboutGithubTokenFeature = (cb) => {
   const obj = {}
   obj[TOKEN_FEATURE_INFORMATION_KEY] = true
 
-  chrome.storage.sync.set(obj, cb)
+  storage.set(obj, cb)
 }
 
-const informUserAboutGithubTokenFeature = () => {
-  chrome.storage.sync.get(TOKEN_FEATURE_INFORMATION_KEY, (storedData) => {
+function informUserAboutGithubTokenFeature () {
+  storage.get(TOKEN_FEATURE_INFORMATION_KEY, function (storedData) {
     const userKnows = storedData[TOKEN_FEATURE_INFORMATION_KEY]
 
     if (!userKnows) {
@@ -63,6 +65,8 @@ const informUserAboutGithubTokenFeature = () => {
 const askGithubToken = (cb) => {
   const githubToken = prompt('Please enter your Github token')
 
+  if (githubToken === null) return
+
   if (githubToken) {
     setGithubToken(githubToken, cb)
   } else {
diff --git a/src/inject.js b/src/inject.js
@@ -4,6 +4,8 @@ const API = 'https://api.github.com/repos/'
 const LI_TAG_ID = 'github-repo-size'
 const GITHUB_TOKEN_KEY = 'x-github-token'
 
+const storage = chrome.storage.sync || chrome.storage.local
+
 let githubToken
 
 const isTree = (uri) => {
@@ -52,7 +54,7 @@ const getHumanReadableSizeObject = (bytes) => {
   }
 
   const K = 1024
-  const MEASURE = ['Bytes', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB']
+  const MEASURE = ['B', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB']
   const i = Math.floor(Math.log(bytes) / Math.log(K))
 
   return {
@@ -73,15 +75,13 @@ const getSizeHTML = (size) => {
   const humanReadableSize = getHumanReadableSizeObject(size)
 
   return '<li id="' + LI_TAG_ID + '">' +
-    '<a>' +
     '<svg class="octicon octicon-database" aria-hidden="true" height="16" version="1.1" viewBox="0 0 12 16" width="12">' +
     '<path d="M6 15c-3.31 0-6-.9-6-2v-2c0-.17.09-.34.21-.5.67.86 3 1.5 5.79 1.5s5.12-.64 5.79-1.5c.13.16.21.33.21.5v2c0 1.1-2.69 2-6 2zm0-4c-3.31 0-6-.9-6-2V7c0-.11.04-.21.09-.31.03-.06.07-.13.12-.19C.88 7.36 3.21 8 6 8s5.12-.64 5.79-1.5c.05.06.09.13.12.19.05.1.09.21.09.31v2c0 1.1-2.69 2-6 2zm0-4c-3.31 0-6-.9-6-2V3c0-1.1 2.69-2 6-2s6 .9 6 2v2c0 1.1-2.69 2-6 2zm0-5c-2.21 0-4 .45-4 1s1.79 1 4 1 4-.45 4-1-1.79-1-4-1z"></path>' +
     '</svg>' +
     '<span class="num text-emphasized"> ' +
     humanReadableSize.size +
     '</span> ' +
     humanReadableSize.measure +
-    '</a>' +
     '</li>'
 }
 
@@ -126,8 +126,9 @@ const getAPIData = (uri, callback) => {
 const getFileName = (text) => text.trim().split('/')[0]
 
 const checkForRepoPage = () => {
-  const repoURI = window.location.pathname.substring(1)
-  const repoPath = repoURI.split('/').splice(4).join('/').trim()
+  let repoURI = window.location.pathname.substring(1)
+  repoURI = repoURI.endsWith('/') ? repoURI.slice(0, -1) : repoURI
+  let repoPath = repoURI.split('/').splice(4).join('/').trim()
 
   if (isTree(repoURI)) {
     const ns = document.querySelector('ul.numbers-summary')
@@ -173,7 +174,7 @@ const checkForRepoPage = () => {
   }
 }
 
-chrome.storage.sync.get(GITHUB_TOKEN_KEY, (data) => {
+storage.get(GITHUB_TOKEN_KEY, function (data) {
   githubToken = data[GITHUB_TOKEN_KEY]
 
   chrome.storage.onChanged.addListener((changes, namespace) => {
