electron git clone status, #28, set values fixed, tabs moved, reset value added, config version issue

Author: akaJes

HACKS

@@ -1,5 +1,4 @@
 nat-upnp/lib/nat-upnp/client.js
-@@ -106,2 +106,3 @@
-        });
-      if (!key) return callback(Error('Incorrect response'));
-        data = data[key];
+@@ -119,3 +119,3 @@
+-       protocol: data.NewProtocol.toLowerCase(),
++       protocol: (data.NewProtocol || '').toLowerCase(),

app/git-tool.js

@@ -42,15 +42,16 @@ exports.Show = (branch, file) => promisify('show', git(root))([branch + ':' + fi
 exports.git=git;
 exports.root = dir => dir || !root ? gitRoot(dir) : Promise.resolve(root);
 
-exports.clone=name=>new Promise((done,fail)=>{
+exports.clone = (name, cb) => new Promise((done, fail) => {
   name = name && ('"' + name + '"') || '';
-  var cmd = exec('git clone https://github.com/MarlinFirmware/Marlin.git ' + name);
+  var cmd = exec('git clone --progress https://github.com/MarlinFirmware/Marlin.git ' + name);
   var timer = setInterval(a=>process.stdout.write("."), 500)
   cmd.stdout.on('data', (data) => {
-    console.log(data.toString());
+    //console.log(data.toString());
   });
   cmd.stderr.on('data', (data) => {
-    console.log(data.toString());
+    //console.error(data.toString());
+    cb && cb(data.toString());
   });
   cmd.on('close', (code) => {
     clearInterval(timer);

app/mc-tool.js

@@ -32,11 +32,13 @@ var addNumber=a=>{
 var killComments=a=>a.map(i=>(i.comment=null,i))
 var killDublicated=a=>a.filter(i=>i.number==undefined||!i.disabled).map(i=>(i.number=undefined,i))
 
+const skips = ['CONFIGURATION_H_VERSION'];
+
 var setConfig=(target,file,root)=>a=>{
   var map=remap(a);
   return Promise.resolve(target).then(t=>{
     var undef=[];
-    var res=t.map(i=>{
+    var res=t.filter(i => skips.indexOf(i.name) < 0).map(i => {
       var o=map[i.name];
       if (!o){
         undef.push(i.line);

app/server.js

@@ -700,7 +700,7 @@ app.post('/set/:file/:name/:prop/:value', function (req, res) {
   var ob = {name: name[0]};
   var set = (prop, val) => ob[prop] = (prop == 'disabled' ? val == 'true' : val);
   name.length > 1 && set('number', parseInt(name[1]));
-  set(req.params.prop, req.params.value);
+  set(req.params.prop, atob(decodeURI(req.params.value)).toString());
   return git.root()
   .then(root => mctool.updateH(root, path.join(root, 'Marlin', req.params.file + '.h'), [ob]))
   .then(a => Object.assign(req.params, {ip: ip}))

index.js

@@ -52,6 +52,7 @@ ipcMain.on('starter-pio', function(ev) {
 app.on('ready', function() {
     var status = new BrowserWindow({width: 400, height: 400, maximizable: false})
     status.setMenu(null);
+    const update = val => status.webContents.send('starter-git', val);
     var folders = store.get('folders') || [];
     var opts = {'-G': 0};
     Object.keys(opts).reduce((v, key) => (v.i = v.p.indexOf(key), v.i >= 0 && (opts[key] = v.p[v.i + 1]), v), {p: process.argv});
@@ -92,7 +93,7 @@ app.on('ready', function() {
           console.log('no repository found in this folder');
           showNotify('Wait while Marlin Firmware repo cloning');
           dir = path.join(dir, 'Marlin')
-          return git.clone(dir)
+          return git.clone(dir, update)
             .then(git.root)
             .then(a => showNotify('Well done!'))
             .catch(e => git.root(dir));

package.json

@@ -1,6 +1,6 @@
 {
   "name": "marlin-conf",
-  "version": "2.9.0",
+  "version": "2.9.1",
   "description": "configuration tool for Marlin project",
   "main": "./index.js",
   "scripts": {
@@ -92,9 +92,9 @@
     "yauzl": "^2.9.1",
     "yazl": "^2.4.3"
   },
-  "devDependencies": {
+  "devDependenciesOff": {
     "devtron": "^1.4.0",
-    "electron": "1.7.x",
+    "electron": "=1.7.10",
     "electron-builder": "^20.2.0",
     "electron-debug": "^1.5.0",
     "eslint": "^4.18.1",

start.js

@@ -49,7 +49,7 @@ function marlin(){
   else
   if ( is.git ) {
     ['Marlin/Configuration_adv','Marlin/Configuration'].forEach(f=>{
-      var base=Promise.all([git.root(),git.Show(is.git,f)]);
+      var base = Promise.all([git.root(), git.Show(is.git, f + '.h')]);
       if ( is.json )
         base
         .then(a=>mctool.makeJson(a[0],a[1])(path.join(a[0],f+'.h')))

static/index.html

@@ -62,6 +62,7 @@
   background: white;
   top: 70%;
   height: 30%;
+  z-index: 5;
 }
 @media (min-width: 992px){
 .mct-hint{
@@ -94,6 +95,7 @@
     z-index: 1030;
     transition: right 1s;
     right:-200px;
+    max-width: 200px;
 }
 .navbar-side-right.toggled,
 .navbar-side-right:hover{
@@ -474,7 +476,15 @@ <h5 class="modal-title" id="mct-restoreModalLabel">Choose desired configuration
     </div>
   </div>
 </nav>
-
+<nav class="navbar navbar-toggleable-md navbar-light bg-faded config-files">
+        <ul class="nav nav-tabs" role="tablist">
+          <template class="_tab_item">
+          <li class="nav-item">
+            <a href="#" class="nav-link" role="tab" data-toggle="tab"></a>
+          </li>
+          </template>
+        </ul>
+</nav>
   <div class="upload-drop-zone" id="mct-dragzone" style="display:none">
       Just drag and drop files here
   </div>
@@ -525,16 +535,9 @@ <h4 class="alert-heading">Information</h4>
 </nav>
 </div>
 <!-- content -->
-  <div class="row" style="margin-bottom: 300px;margin-top:100px;">
+  <div class="row" style="margin-bottom: 300px;margin-top:150px;">
     <div class="col-12 col-md-12 col-lg-7">
-      <div class="tabbable config-files">
-        <ul class="nav nav-tabs" role="tablist">
-          <template class="_tab_item">
-          <li class="nav-item">
-            <a href="#" class="nav-link" role="tab" data-toggle="tab"></a>
-          </li>
-          </template>
-        </ul>
+      <div class="tabbable">
         <div class="tab-content">
           <template class="_tab_content">
           <div class="tab-pane fade" id="panel-ID" role="tabpanel">
@@ -561,7 +564,12 @@ <h4 class="alert-heading">Information</h4>
     </label>
 </div>
                         <div class="mb-1 mct-splitter"></div>
+<div class="input-group">
                         <input type="text" class="form-control form-control-sm">
+  <div class="input-group-btn">
+<button class="btn btn-secondary btn-sm" type="button"><i class="fa fa-times"></i></button>
+  </div>
+</div>
   <select class="custom-select   form-control-sm">
     <option value="true">True</option>
     <option value="false">False</option>

static/main.js

@@ -328,7 +328,7 @@ $(function(){
             d.find('label').eq(0).text(define.split('.')[0]).attr('title',def.line.trim())//.tooltip(def.line.length>24&&tooltip_large); //take 200ms
             var dis=d.find('.onoffswitch')
             var p=d.find('.mct-splitter');
-            var val=d.find('input[type=text]');
+            var val=d.find('.input-group');
             var sel=d.find('select');
             if (def.value == undefined)
               val.remove(),p.remove(),sel.remove();
@@ -348,7 +348,7 @@ $(function(){
                   def.type='numeric';
                 }
               }
-              var inp=val;
+              var inp=val.find('input');
               if (['boolean','select'].indexOf(def.type)>=0){
                 inp=sel;
                 val.remove();
@@ -366,10 +366,9 @@ $(function(){
               }else{
                 if (def.type=='string')
                   dv=dv.slice(1,-1)
-                val.val(dv);
+                inp.val(dv);
                 sel.remove();
               }
-              inp.attr('dtype', def.type)
             }
 
             if ( !( def.changed && def.changed.disabled ) && !def.disabled && def.value != undefined)
@@ -400,18 +399,26 @@ $(function(){
             loadHint(define);
           if (btn.hasClass('fa-github'))
             window.opener("https://github.com/MarlinFirmware/Marlin/search?q=" + define + "&type=Issues&utf8=%E2%9C%93", "_blank");
+          if (btn.find('.fa-times').length) {
+            var inp = $(this).parent().siblings('input');
+            var val = opts[define].value;
+            if (opts[define].type == 'string')
+              val = val.slice(1, -1);
+            inp.val(val);
+            processProp(define, 'value', opts[define].value)
+          }
         })
         function processProp(define, name, val) {
           lastChanged = define + name;
-          saveProp('/set/' + file.file.name + '/' + define + '/' + name + '/' + val)
+          saveProp('/set/' + file.file.name + '/' + define + '/' + name + '/' + encodeURI(btoa(val)))
           .then(function() {
               setProp(define, name, val);
           });
         }
         tab.tab.on('change', '.card-block select,.card-block input[type=text]', function() {
           var btn = $(this), define = btn.parents('.form-group').attr('define');
           var val = btn.val();
-          if (btn.attr('dtype') == 'string')
+          if (opts[define].type == 'string')
               val = '"' + val + '"';
           processProp(define, 'value', val);
         })
@@ -441,6 +448,7 @@ $(function(){
           setTimeout(function(){location.hash=href+' ';},500);
         }
       });
+      return;
       var sideCountdown = 3;
       $(window).scroll($.debounce( 250, true, function(){
         sideCountdown && $('.navbar-side-right').toggleClass('toggled', true);
@@ -715,7 +723,7 @@ $(function(){
       source.addEventListener('set', function(event) {
         var data= JSON.parse(event.data);
         if (lastChanged!==data.name+data.prop){
-          var def=opts[data.name],val=data.value,ui=uiDefs[data.name];
+          var def=opts[data.name],val=atob(decodeURI(data.value)).toString(),ui=uiDefs[data.name];
           if (data.prop=='disabled'){
             val=val=='true';
             ui.find('.onoffswitch input').prop('checked',!val)
@@ -757,7 +765,7 @@ $(function(){
     proc.init=function(){ p.text(''); r.modal();}
     proc.info=function(){
       _add($('template._alert'))
-      .find('p').html(`to install PlatformIO use guide from 
+      .find('p').html(`to install PlatformIO use guide from
 <strong><a target="_blank" href="http://docs.platformio.org/en/latest/installation.html">Official site</a></strong>
 <br>Linux/Mac hint:  <code>sudo apt install python-pip</code> <code>sudo pip install -U platformio</code>`)
     }

views/start.html

@@ -71,7 +71,7 @@
  margin: 5px;
  padding:0;
 }
-li {
+.trim-left {
   white-space: nowrap;
   overflow: hidden;
   text-overflow: ellipsis;
@@ -115,6 +115,11 @@
     $('.component.pio .state').text(data ? 'instaled' : 'error');
     data && $('.component.pio').addClass('installed');
   });
+  ipc.on('starter-git', function(ev, data) {
+    var a = data.split(' ');
+    var i = a.findIndex(function(i) { return i.indexOf('%') >= 0;})
+    i >= 0 && $('.folder span').text(a[i] + ' ' + a[i + 1]);
+  });
   ipc.on('starter-init', function(ev, data) {
     ['git','pio'].map(function(i) {
       var c = $('.component.' + i)
@@ -123,7 +128,7 @@
     });
     data.pio && $('.component.pio button').text('reinstall')
     +(data.folders || []).slice(0,4).map(function(f, n) {
-      $('ul').append($('<li>').text(f).attr('n', n).attr('title', f))
+      $('ul').append($('<li>').addClass('trim-left').text(f).attr('n', n).attr('title', f))
     });
   })
 })
@@ -152,7 +157,7 @@
 </div></div>
 
 <div class="component folder">
-<br>
+<span>&nbsp;</span>
 <button>open folder</button>
 <ul>
 <li n="new" class="active">new</li>