Merge branch 'dev'

Author: MCStreetguy

CHANGELOG.md

@@ -6,6 +6,8 @@
 **latest release**
 #### Features
 - Debug functionalities *(for easier bug reporting)*
+- Snippet class:
+  - (+) Author
 #### Improvements
 - Path resolvement
 - Debug options storing
@@ -14,6 +16,7 @@
 #### Patches
 - Error while reading stored files
 - Migration even if there were no changes made
+- Debug snippet logging
 
 ---
 

lib/snippet-injector.js

@@ -51,14 +51,24 @@ export default {
     if(window.localStorage.getItem('snippet-injector-debug') === 'true') {
       if(window.localStorage.getItem('snippet-injector-debug-time') === 'true') {
         console.timeEnd("snippet-injector:activate duration");
+        if(window.localStorage.getItem('snippet-injector-debug-objl') !== 'true')
         console.groupEnd();
       }
 
       if(window.localStorage.getItem('snippet-injector-debug-objl') === 'true') {
+        var snippets = new Array();
+        var _this = this;
+        _this.storage.retrieveFiles().forEach(function(e) {
+          snippets.push(JSON.parse(_this.storage.retrieveFile(e.replace('.json',''))));
+        });
+        if(window.localStorage.getItem('snippet-injector-debug-time') === 'true') {
+          console.groupEnd();
+        }
         console.group(_debug.groupTitle.objectLogging);
         console.log({
           subscriptions: this.subscriptions,
-          storage: this.storage
+          storage: this.storage,
+          _snippets: snippets
         });
         console.groupEnd();
       }

lib/snippet.js

@@ -1,6 +1,7 @@
 'use babel';
 
 import Util from './util.js';
+const os = require('os');
 
 export default class Snippet {
 
@@ -10,6 +11,7 @@ export default class Snippet {
   lang = '';
   uid = Date.now().toString();
   version = undefined;
+  author = os.userInfo().username;
 
   constructor(state) {
     if(typeof state === 'object') {
@@ -31,6 +33,9 @@ export default class Snippet {
       if(Util.isset(state.version,'string')) {
         this.version = state.version;
       }
+      if(Util.isset(state.author,'string')) {
+        this.author = state.author;
+      }
     }
   }
 
@@ -42,7 +47,8 @@ export default class Snippet {
       'content':this.getContent(),
       'lang':this.getLang(),
       'uid':this.getUID(),
-      'version':this.getVersion()
+      'version':this.getVersion(),
+      'author':this.getAuthor()
     };
   }
 
@@ -74,6 +80,10 @@ export default class Snippet {
     return this.version;
   }
 
+  getAuthor() {
+    return this.author;
+  }
+
   setTitle(newtitle) {
     this.title = newtitle;
   }
@@ -97,4 +107,8 @@ export default class Snippet {
   setUID(newuid) {
     this.uid = newuid;
   }
+
+  setAuthor(newauthor) {
+    this.author = newauthor;
+  }
 }

lib/storage.js

@@ -4,7 +4,8 @@ import { dirname } from 'path';
 import Snippet from './snippet.js';
 import Util from './util.js';
 const fs = require('fs');
-// const os = require('os');
+
+const lastSnippetUpdate = '1.1.8';
 
 export default class Storage {
 
@@ -174,8 +175,8 @@ export default class Storage {
           _this.backup(current);
 
           var snippet = new Snippet(JSON.parse(_this.retrieveFile(current)));
-          var res = Util.compareVersions('1.0.0',snippet.getVersion());
-          if(res === '1.0.0' || res === undefined) {
+          var res = Util.compareVersions(lastSnippetUpdate,snippet.getVersion());
+          if(res === lastSnippetUpdate || res === undefined) {
             snippet.setVersion(Util.getPackageVersion());
             snippet.setUID(Util.generateUID({
               unique: true,