Enabled opt-in/out to sentry telemetry per #57

rooey · Jun 13, 2020 · 809df1c · 809df1c
1 parent a6c5afe
commit 809df1c
Show file tree

Hide file tree

Showing 4 changed files with 59 additions and 23 deletions.
diff --git a/src/manifest.json b/src/manifest.json
@@ -3,8 +3,8 @@
   "name": "__MSG_appName__",
   "short_name": "__MSG_shortName__",
   "description": "__MSG_appDescription__",
-  "version": "3.0.0.36113",
-  "version_name": "3.0.0 Beta 2 - Build 36113",
+  "version": "3.0.0.36134",
+  "version_name": "3.0.0 Alpha - Build 36134",
   "default_locale": "en",
   "permissions": [
     "identity",

diff --git a/src/scripts/onedrive_client.js b/src/scripts/onedrive_client.js
@@ -3,6 +3,8 @@
 let storedAppInfo = null;
 
 let appInfo = {
+    // Use set debugMode to true to enable verbose logging (alpha builds)
+    "debugMode": true,
     "clientId": "7bee6942-63fb-4fbd-88d6-00394941de08",
     "clientSecret": "KEYGOESINHERE",
     "redirectUrl": chrome.identity.getRedirectURL(""),
@@ -31,7 +33,6 @@ class OneDriveClient {
     authorize(successCallback, errorCallback) {
         this.access_token_ = this.getTokenFromCookie('access');
         if (this.access_token_) {
-            //console.log('already good');
             successCallback();
         }
         else {
@@ -1026,6 +1027,14 @@ class OneDriveClient {
         return '{' + entries.join(',') + '}';
     }
 
+    writeLog(messageType, message, payload) {
+        var appInfo = this.getAppInfo();
+
+        if ((messageType === 'debug') && (appInfo.debugMode !==false)) return;
+        console.log('[' + messageType + '] ' + message, payload);
+        return;
+    };
+
 };
 
 // Export

diff --git a/src/scripts/onedrive_fs.js b/src/scripts/onedrive_fs.js
@@ -23,7 +23,8 @@ class OneDriveFS {
         onedriveClient.authorize(() => {
             onedriveClient.getDriveData((driveInfo) => {
                 onedriveClient.getUserInfo((userInfo) => {
-                    console.log(driveInfo);
+                    onedriveClient.writeLog('debug', 'driveInfo', driveInfo);
+
                     const fileSystemId = this.createFileSystemID(driveInfo.id);
                     chrome.fileSystemProvider.getAll(fileSystems => {
                         let mounted = false;
@@ -55,15 +56,12 @@ class OneDriveFS {
                         }
                     });
                 }, reason => {
-                    console.log(reason);
                     errorCallback(reason);
                 });
             }, reason => {
-                console.log(reason);
                 errorCallback(reason);
             });
         }, reason => {
-            console.log(reason);
             errorCallback(reason);
         });
     }
@@ -364,6 +362,7 @@ class OneDriveFS {
                     });
                 });
             } else {
+                this.sendMessageToSentry('It worked', 'hooray');
                 callback(options, successCallback, errorCallback);
             }
         };
@@ -477,16 +476,20 @@ class OneDriveFS {
     };
 
     sendMessageToSentry(message, extra) {
-        /*if (Raven.isSetup()) {
-            Raven.captureMessage(new Error(message), {
-                extra: extra,
-                tags: {
-                    'app.version': chrome.runtime.getManifest().version
-                }
-            });
-        }*/
-        console.log('sentrylognotsent:', message, extra);
-    };
+        this.useOptions('useSentry', use => {
+            if (!use) {
+                return;
+            }
+            if (Raven.isSetup()) {
+                Raven.captureMessage(new Error(message), {
+                    extra: extra,
+                    tags: {
+                        'app.version': chrome.runtime.getManifest().version
+                    }
+                });
+            }
+        });
+    }
 
     getWatchers(fileSystemId) {
         let watchers = this.watchers_[fileSystemId];
@@ -501,15 +504,22 @@ class OneDriveFS {
         delete this.watchers_[fileSystemId];
     }
 
-    useWatcher(callback) {
+    /*useWatcher(callback) {
         chrome.storage.local.get('settings', items => {
             const settings = items.settings || {};
             callback(settings.useWatcher || false);
         });
+    }*/
+
+    useOptions(options, callback) {
+        chrome.storage.local.get('settings', items => {
+            const settings = items.settings || {};
+            callback(settings[options] || false);
+        });
     }
 
     watchDirectory(fileSystemId, onedriveClient, entryPath) {
-        this.useWatcher(use => {
+        this.useOptions('useWatcher', use => {
             if (!use) {
                 return;
             }

diff --git a/src/scripts/window.js b/src/scripts/window.js
@@ -52,12 +52,17 @@ class MountWindow {
             });
         }
         document.querySelector('#useWatcherOn').addEventListener('click', () => {
-            this.onChangedUseWatcher(true);
+            this.onChangedUseOption('useWatcher', true);
         });
         document.querySelector('#useWatcherOff').addEventListener('click', () => {
-            this.onChangedUseWatcher(false);
+            this.onChangedUseOption('useWatcher', false);
         });
-    }
+        document.querySelector('#useSentryOn').addEventListener('click', () => {
+            this.onChangedUseOption('useSentry', true);
+        });
+        document.querySelector('#useSentryOff').addEventListener('click', () => {
+            this.onChangedUseOption('useSentry', false);
+        });    }
 
     onClickedBtnMount(evt) {
         const btnMount = document.querySelector('#btnMount');
@@ -126,8 +131,10 @@ class MountWindow {
             const settings = items.settings || {};
             const openedFilesLimit = settings.openedFilesLimit || '10';
             const useWatcher = settings.useWatcher || false;
+            const useSentry = settings.useSentry || false;
             document.querySelector('#openedFilesLimit' + openedFilesLimit).checked = true;
             document.querySelector('#useWatcher' + (useWatcher ? 'On' : 'Off')).checked = true;
+            document.querySelector('#useSentry' + (useSentry ? 'On' : 'Off')).checked = true;
             $('#settingsDialog').modal('show');
         });
     }
@@ -144,14 +151,24 @@ class MountWindow {
         });
     }
 
-    onChangedUseWatcher(use) {
+    /*onChangedUseWatcher(use) {
         chrome.storage.local.get('settings', items => {
             const settings = items.settings || {};
             settings.useWatcher = use;
             chrome.storage.local.set({settings: settings}, () => {
                 console.log('Saving settings done.');
             });
         });
+    }*/
+
+    onChangedUseOption(options, use) {
+        chrome.storage.local.get('settings', items => {
+            const settings = items.settings || {};
+            settings[options] = use;
+            chrome.storage.local.set({settings: settings}, () => {
+                console.log('Saving settings done.');
+            });
+        });
     }
 
 };