Added URL uploading

YatharthVats · YatharthVats · commit 3417e293b383 · 2020-02-07T18:04:59.000+05:30
URL data and time now gets uploaded on changing tabs
diff --git a/background.html b/background.html
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html>
+    <head>
+        <script src="https://www.gstatic.com/firebasejs/7.6.0/firebase-app.js"></script>
+        <script src="https://www.gstatic.com/firebasejs/7.6.0/firebase-firestore.js"></script>
+        <script src="./init-firebase.js"></script>
+        <script src="./config.js"></script>
+        <script src="./sites.js"></script>
+        <script src="./tracker.js"></script>
+        <script src="./background.js"></script>
+        <script src="./videoRecord.js"></script>
+    </head>
+    <body></body>
+</html>
diff --git a/background.js b/background.js
@@ -73,3 +73,4 @@ chrome.alarms.onAlarm.addListener(function(alarm) {
     clearStats(config);
   }
 });
+
diff --git a/manifest.json b/manifest.json
@@ -7,16 +7,12 @@
       "default_popup": "popup.html",
       "default_title": "Monitoring Extension"
     },
-    "content_security_policy": "script-src 'self' https://www.gstatic.com/ https://*.firebaseio.com https://ssl.google-analytics.com; object-src 'self'",
+    "content_security_policy": "script-src 'self' https://www.gstatic.com/ https://*.firebaseio.com https://ssl.google-analytics.com; object-src 'self';",
     "background": {
       "persistent": true,
-      "scripts": ["config.js", "sites.js", "tracker.js", "background.js","videoRecord.js"]
+      "page":"background.html"
   },
     "manifest_version": 2,
-    "oauth2": {
-        "client_id": "980342292470-ttlch1q7jn30l0atg06eeqb0r8u5qmvk.apps.googleusercontent.com",
-        "scopes": [ "https://www.googleapis.com/auth/drive.file" ]
-     },
      "options_page": "options.html",
     "icons": { "19": "images/icon19.png", "38": "images/icon38.png",
              "128": "images/icon.png" },
diff --git a/options.html b/options.html
@@ -9,8 +9,8 @@
 
   <body>
     <script src="https://www.gstatic.com/firebasejs/7.6.0/firebase-app.js"></script>
-<script src="https://www.gstatic.com/firebasejs/7.6.0/firebase-firestore.js"></script>
-<script src="./init-firebase.js"></script>
+  <script src="https://www.gstatic.com/firebasejs/7.6.0/firebase-firestore.js"></script>
+  <script src="./init-firebase.js"></script>
     <b>Time Display</b>:
     <select id="time_display" class="pure-input-1-2">
       <option value="0">Pretty</option>
diff --git a/options.js b/options.js
@@ -91,52 +91,18 @@ function restoreOptions() {
   }
 }
 
-function getTimestamp() {
-  var e = new Date,
-      t = e.getFullYear(),
-      o = ("00" + (e.getMonth() + 1)).slice(-2),
-      n = ("00" + e.getDate()).slice(-2),
-      r = ("00" + e.getHours()).slice(-2),
-      s = ("00" + e.getMinutes()).slice(-2),
-      i = t + "-" + o + "-" + n + "_" + r + "-" + s;
-  return i
-}
-
-//Timer for peiodic uploads
-var time=0;
-
 function download() {
   var csvContent = "data:text/csv;charset=utf-8,";
   var sitesDict = sites.sites;
   var pairs = [];
-  var dict={}
+  var dict={};
   for (var site in sitesDict) {
     if (sitesDict.hasOwnProperty(site)) {
       pairs.push(site + "," + sitesDict[site]);
-      dict[site]=sitesDict[site];
     }
   }
   csvContent += pairs.join("\n");
   window.open(encodeURI(csvContent));
-  
-//  for (index = 0; index < pairs.length; index++){
-    db.collection("tracking_test").add({
-//      url: pairs[index].split(",")[0],
-//      time: parseFloat(pairs[index].split(",")[1])
-        // url:pairs.split(",")[0],
-        // time:parseFloat(pairs.split(",")[1])
-        url:dict[0],
-        time:dict[1],
-        uploading_time:getTimestamp()
-    })
-    .then(function(docRef) {
-      console.log("Document written with ID: ", docRef.id);
-  })
-  .catch(function(error) {
-      console.error("Error adding document: ", error);
-  });
-//  }
-
 }
 
 document.addEventListener("DOMContentLoaded", function () {
diff --git a/popup.html b/popup.html
@@ -21,6 +21,9 @@
       <script src="popup.js"></script>
   </head>
   <body>
+    <script src="https://www.gstatic.com/firebasejs/7.6.0/firebase-app.js"></script>
+  <script src="https://www.gstatic.com/firebasejs/7.6.0/firebase-firestore.js"></script>
+  <script src="./init-firebase.js"></script>
     <div id="button_row">
       <button id="options" class="pure-button">Options</button>&nbsp;
       <button id="clear" class="pure-button">Clear</button>&nbsp;
diff --git a/sites.js b/sites.js
@@ -3,6 +3,11 @@
  *
  * The primary interface to this class is through setCurrentFocus.
  */
+var globt=0;
+var prev_url=null;
+var prev_domain=null;
+var start_time;
+
 function Sites(config) {
   this._config = config;
   if (!localStorage.sites) {
@@ -48,7 +53,7 @@ Sites.prototype._updateTime = function() {
     return;
   }
   var delta = new Date() - this._startTime;
-  console.log("Site: " + this._currentSite + " Delta = " + delta/1000);
+ // console.log("Site: " + this._currentSite + " Delta = " + delta/1000);
   if (delta/1000/60 > 2*this._config.updateTimePeriodMinutes) {
     console.log("Delta of " + delta/1000 + " seconds too long; ignored.");
     return;
@@ -58,6 +63,7 @@ Sites.prototype._updateTime = function() {
     sites[this._currentSite] = 0;
   }
   sites[this._currentSite] += delta/1000;
+  globt=delta/1000;
   localStorage.sites = JSON.stringify(sites);
 };
 
@@ -66,7 +72,7 @@ Sites.prototype._updateTime = function() {
  * Provide url=null if Chrome is out of focus.
  */
 Sites.prototype.setCurrentFocus = function(url) {
-  console.log("setCurrentFocus: " + url);
+ // console.log("setCurrentFocus: " + url);
   this._updateTime();
   if (url == null) {
     this._currentSite = null;
@@ -75,8 +81,22 @@ Sites.prototype.setCurrentFocus = function(url) {
         {path: {19: 'images/icon_paused19.png',
                 38: 'images/icon_paused38.png'}});
   } else {
+    if(globt>1 && prev_url!=="" && prev_domain!==null){
+    siteInfo={
+      url:prev_url,
+      site:prev_domain,
+      time:globt,
+      start_time: start_time,
+      uploading_time:getTimestamp()
+    }
+    console.log(siteInfo);
+    uploadInfo(siteInfo);
+  }
+    prev_url=url;
+    prev_domain=this.getSiteFromUrl(prev_url);
     this._currentSite = this.getSiteFromUrl(url);
     this._startTime = new Date();
+    start_time= getTimestamp();
     chrome.browserAction.setIcon(
         {path: {19: 'images/icon19.png',
                 38: 'images/icon38.png'}});
@@ -90,3 +110,26 @@ Sites.prototype.clear = function() {
   localStorage.sites = JSON.stringify({});
   this._config.lastClearTime = new Date().getTime();
 };
+
+
+
+uploadInfo = (siteInfo) =>{
+  db.collection("tracking_test").add(siteInfo)
+  .then(function(docRef) {
+    console.log("Document written with ID: ", docRef.id);
+})
+.catch(function(error) {
+    console.error("Error adding document: ", error);
+});
+};
+function getTimestamp() {
+  var e = new Date,
+      t = e.getFullYear(),
+      o = ("00" + (e.getMonth() + 1)).slice(-2),
+      n = ("00" + e.getDate()).slice(-2),
+      r = ("00" + e.getHours()).slice(-2),
+      s = ("00" + e.getMinutes()).slice(-2),
+      i = t + "-" + o + "-" + n + "_" + r + "-" + s;
+  return i;
+}
+
diff --git a/tracker.js b/tracker.js
@@ -1,11 +1,15 @@
 /**
  * Responsible for detecting focus change from tabs and windows.
  */
+
+ var startDate=new Date();
 function Tracker(config, sites) {
   this._sites = sites;
   var self = this;
   chrome.tabs.onUpdated.addListener(
     function(tabId, changeInfo, tab) {
+//      console.log("Trying1");
+
       // This tab has updated, but it may not be on focus.
       // It is more reliable to request the current tab URL.
       self._updateTimeWithCurrentTab();
@@ -14,6 +18,9 @@ function Tracker(config, sites) {
   chrome.tabs.onActivated.addListener(
     function(activeInfo) {
       chrome.tabs.get(activeInfo.tabId, function(tab) {
+ //       console.log("Trying2");
+   //     console.log(self);
+ //       upload(tab.url,)
         self._sites.setCurrentFocus(tab.url);
       });
     }
@@ -24,15 +31,18 @@ function Tracker(config, sites) {
         self._sites.setCurrentFocus(null);
         return;
       }
+ //     console.log("Trying3"+document.title);
       self._updateTimeWithCurrentTab();
     }
   );
   chrome.idle.onStateChanged.addListener(function(idleState) {
     if (idleState == "active") {
       config.idle = false;
+  //    console.log("Trying4"+document.title);
       self._updateTimeWithCurrentTab();
     } else {
       config.idle = true;
+  //    console.log("Trying5");
       self._sites.setCurrentFocus(null);
     }
   });
diff --git a/videoRecord.js b/videoRecord.js
@@ -12,6 +12,7 @@ var autoUploading;
 var startTime;
 var finishTime;
 var uploadTimer;
+var flag=0;
 var gumVideo = document.querySelector('#video');
 var $timer = document.querySelector('#timer');
 var $stopBtn = document.querySelector('#stop');
@@ -53,22 +54,11 @@ function handleDataAvailable(event) {
   }
 }
 
-//var downloadLink=document.getElementById("download");
-
 function handleStop(event) {
   console.log('Recorder stopped: ', event);
 }
 
 
-function toggleRecording() {
-  if (recordButton.textContent === 'Start Recording') {
-    startRecording();
-  } else {
-    stopRecording();
-  }
-}
-
-
 // The nested try blocks will be simplified when Chrome 47 moves to Stable
 function startRecording() {
   var options = {

Original file line number	Diff line number	Diff line change
`@@ -73,3 +73,4 @@ chrome.alarms.onAlarm.addListener(function(alarm) {`
`73`	`73`	`clearStats(config);`
`74`	`74`	`}`
`75`	`75`	`});`
	`76`	`+`