FIX: Migrations

Author: MCStreetguy

lib/snippet-injector.js

@@ -13,8 +13,10 @@ export default {
 
   activate(state) {
     this.storage = new Storage({dir: '/storage/snippet-injector/snippets/'});
+    console.warn(this.storage.storageDir);
+    console.warn(this.storage.dir);
     this.storage.migrate();
-    
+
     // Events subscribed to in atom's system can be easily cleaned up with a CompositeDisposable
     this.subscriptions = new CompositeDisposable();
     // Register command that toggles this view

lib/snippet.js

@@ -9,7 +9,7 @@ export default class Snippet {
   tags = new Array();
   lang = '';
   uid = Date.now().toString();
-  version = Util.getPackageVersion();
+  version = undefined;
 
   constructor(state) {
     if(typeof state === 'object') {
@@ -93,4 +93,8 @@ export default class Snippet {
   setVersion(newversion) {
     this.version = newversion;
   }
+
+  setUID(newuid) {
+    this.uid = newuid;
+  }
 }

lib/storage.js

@@ -2,6 +2,7 @@
 
 import { dirname } from 'path';
 import Snippet from './snippet.js';
+import Util from './util.js';
 const fs = require('fs');
 const os = require('os');
 
@@ -112,26 +113,34 @@ export default class Storage {
       throw new TypeError('Storage directory has not been initialized.');
     } else {
       var files = this.retrieveFiles();
-      var changed = 0;
-      var migrated = 'The following snippets have been migrated:\n';
       if(files.length > 0) {
-        files.forEach(function(current,index) {
+        var changed = 0;
+        var migrated = 'The following snippets have been migrated:\n';
+        var store = this.storageDir+this.dir;
+        var _this = this;
+        files.forEach(function(current) {
           if(current.endsWith('.snippet.json')) {
-            fs.renameSync(this.storageDir+this.dir+current,this.storageDir+this.dir+current.replace('.snippet.json','.json'));
-            current = current.replace('.snippet.json','.json');
+            fs.renameSync(store+current,store+current.replace('.snippet.json','.json'));
+            current = current.replace('.snippet.json','');
           } else {
             current = current.replace('.json','');
           }
 
-          var snippet = new Snippet(JSON.parse(this.retrieveFile(current)));
+          var snippet = new Snippet(JSON.parse(_this.retrieveFile(current)));
           var res = Util.compareVersions(Util.getPackageVersion(),snippet.getVersion());
-          if(res !== false && res === Util.getPackageVersion()) {
-            this.store(snippet);
-            this.deleteFile(current);
-            migrated += snippet.getTitle();
-            if(index < files.length-1) {
-              migrated += ', ';
-            }
+          if(res === Util.getPackageVersion() || res === undefined) {
+            snippet.setVersion(Util.getPackageVersion());
+            snippet.setUID(Util.generateUID({
+              unique: true,
+              tester: storage.testFile,
+              timeout: 25,
+              length: 20,
+              prefix: 'sn',
+              insertstring: 'SNIPPET'
+            }));
+            _this.store(snippet);
+            _this.deleteFile(current);
+            migrated += '\''+snippet.getTitle()+'\'\n';
             changed++;
           }
         });

lib/util.js

@@ -329,35 +329,41 @@ export default class Util {
   }
 
   static compareVersions(vers1, vers2) {
-    versionA = {
-      major: vers1.split('.')[0],
-      minor: vers1.split('.')[1],
-      patch: vers1.split('.')[2]
-    };
-    versionB = {
-      major: vers2.split('.')[0],
-      minor: vers2.split('.')[1],
-      patch: vers2.split('.')[2]
-    };
-
-    if(versionA.major > versionB.major) {
-      return vers1;
-    } else if(versionB.major > versionA.major) {
-      return vers2;
-    } else {
-      if(versionA.minor > versionB.minor) {
+    if(this.isset(vers1,'string') && this.isset(vers2,'string')) {
+      var versionA = {
+        major: parseInt(vers1.split('.')[0]),
+        minor: parseInt(vers1.split('.')[1]),
+        patch: parseInt(vers1.split('.')[2])
+      };
+      console.log(versionA);
+      var versionB = {
+        major: parseInt(vers2.split('.')[0]),
+        minor: parseInt(vers2.split('.')[1]),
+        patch: parseInt(vers2.split('.')[2])
+      };
+      console.log(versionB);
+      
+      if(versionA.major > versionB.major) {
         return vers1;
-      } else if(versionB.minor > versionA.minor) {
+      } else if(versionB.major > versionA.major) {
         return vers2;
       } else {
-        if(versionA.patch > versionB.patch) {
+        if(versionA.minor > versionB.minor) {
           return vers1;
-        } else if(versionB.patch > versionA.patch) {
+        } else if(versionB.minor > versionA.minor) {
           return vers2;
         } else {
-          return false;
+          if(versionA.patch > versionB.patch) {
+            return vers1;
+          } else if(versionB.patch > versionA.patch) {
+            return vers2;
+          } else {
+            return false;
+          }
         }
       }
+    } else {
+      return undefined;
     }
   }