Updater Tested without Configs from Storage and verifcation

Author: Felix Epp

app/background_app.js

@@ -25,6 +25,8 @@ import log from 'rose/log';
 import ExtractorEngine from 'rose/extractor-engine';
 import ObserverCollection from 'rose/collections/observers';
 import ExtractorCollection from 'rose/collections/extractors';
+// import SystemConfigs from 'rose/models/system-config';
+import Updater from 'rose/updater';
 
 import WindowTracker from 'rose/activity-trackers/window';
 
@@ -47,6 +49,9 @@ import WindowTracker from 'rose/activity-trackers/window';
   }
 
   WindowTracker.start();
+
+
+  // setTimeout(Updater.update,5000);
 })();
 
 kango.ui.browserButton.addEventListener(kango.ui.browserButton.event.COMMAND, function(event) {
@@ -59,13 +64,23 @@ kango.addMessageListener('LoadNetworks', function(event) {
     /*
      * Store Observers and extractors in storage
      * FIX: Updater loads observers
+     * Fix: Remove old networks
      */
     var extractorCol = new ExtractorCollection();
     var observerCol = new ObserverCollection();
     var networks = event.data;
 
+
     observerCol.fetch({success: () => {
+    //   observerCol.each((model) => {
+    //     observerCol.remove(model);
+    //     model.destroy();
+    //   });
       extractorCol.fetch({success: () => {
+      //   extractorCol.each((model) => {
+      //     extractorCol.remove(model);
+      //     model.destroy();
+      //   });
         for (var i = 0; i < networks.length; i++) {
           if(networks[i].observers !== undefined) {
             for (var j = 0; j < networks[i].observers.length; j++) {

app/rose/updater.js

@@ -1,66 +1,85 @@
-/* ################# DRAFT ! NEVER RUN ############# */
+import ConfigModel from 'rose/models/system-config';
+import ObserverCollection from 'rose/collections/observers';
+import ExtractorCollection from 'rose/collections/extractors';
 
-import ConfigModel from 'models/system-config';
-import ObserverCollection from 'collections/observers';
-import ExtractorCollection from 'collections/extractors';
+let configs = new ConfigModel();
 
-class Updater {
-  constructor() {
-    // code
-    this.configs = new ConfigModel();
-    this.configs.fetch();
+let update = () => {
+  configs.fetch({success: () => {
+    //request repo url and update observer/extractor accordingly
+    // $.get(configs.get('repositoryURL'), function(data) {
+    $.get('https://secure-software-engineering.github.io/rose/example/base.json', function(data) {
 
-    this.observers = new ObserverCollection();
-    this.extractors = new ExtractorCollection();
-    this.fetchCollections();
-  }
+      console.log(data);
 
-  fetchCollections() {
-    return $.when(this.observers.fetch(), this.extractors.fetch());
-  }
+      //verfiy timestamp and signature
+      //iterate through networks
 
-  updateFromRepository() {
-    //request repo url and update observer/extractor accordingly
-    $.get(this.configs.get('repositoryURL'), function(data) {
-        console.log(data);
-        //verfiy timestamp and signature
-        //iterate through networks
-        let networks = this.configs.get(networks);
+
+      let lastUpadte = 1436534468580;
+      if (lastUpadte < data.timestamp) {
+
+        // let networks = this.configs.get(networks);
+        let networks = [{ id: 1, name: 'Facebook', descriptiveName: 'Facebook', identifier: 'facebook.com'}];
         for (var n = networks.length - 1; n >= 0; n--) {
-            let network = networks[n].name;
+          debugger;
+          let remoteNetwork = _.findWhere(data.networks, {id: networks[n].id, name: networks[n].name});
 
+          if (remoteNetwork !== undefined) {
             //request observer file
+            $.get('https://secure-software-engineering.github.io/rose/example/' + remoteNetwork.observers, function(observers) {
+              console.log(observers);
+              updateByVersion(new ObserverCollection(), observers);
+            });
             //request extractor file
+            $.get('https://secure-software-engineering.github.io/rose/example/' + remoteNetwork.extractors, function(extractors) {
+              console.log(extractors);
+              updateByVersion(new ExtractorCollection(), extractors);
+            });
+
+          }
+        }
+      }
 
-        };
     });
-  }
+  }});
+};
 
-  updateObservers(observers) {
-      this.observers.each((observer) => {
-          let remoteObserver = _.findWhere(observers, {name: observer.get('name'), network: observer.get('network')});
+let compareVersion = (version1, version2) => {
 
-          if (remoteObserver !== undefined && Number(remoteObserver.version) > Number(observer.get('version'))) {
-              observer.save(remoteObserver);
-          }
-      });
+    var result = false;
 
-  }
+    version1 = version1.split('.');
+    version2 = version2.split('.');
 
-  updateExtractors(extractors) {
-      this.extractors.each((extractor) => {
-          let remoteExtractor = _.findWhere(extractors, {name: extractor.get('name'), network: extractor.get('network')});
+    for(var i=0; i < (Math.max(version1.length,version2.length)); i++){
 
-          if (remoteExtractor !== undefined && Number(remoteExtractor.version) > Number(extractor.get('version'))) {
-              extractor.save(remoteObserver);
-          }
-      });
+        if(version1[i] === undefined){ version1[i] = 0; }
+        if(version2[i] === undefined){ version2[i] = 0; }
 
-  }
+        if(Number(version1[i]) < Number(version2[i])){
+            result = true;
+            break;
+        }
+        if(version1[i] !== version2[i]){
+            break;
+        }
+    }
+    return(result);
+};
 
-  loadAllIntoStorage(networks) {
-    //load all observers / extractors
-  }
-}
+let updateByVersion = (collection, newCollection) => {
+  collection.fetch({success: () => {
+         debugger;
+    collection.each((model) => {
+      let remoteModel = _.findWhere(newCollection, {name: model.get('name'), network: model.get('network')});
+      if (remoteModel !== undefined && compareVersion(model.get('version'), remoteModel.version)) {
+        model.save(remoteModel);
+        console.log('updated observer/extractor');
+      }
+      else console.log('no update');
+    });
+  }});
+};
 
-export default Updater;
+export default {update};