xo comply

Author: ppot

app/win/pane.js

@@ -1,7 +1,5 @@
-const initSession = require('../utils/init-session');
 const {exec} = require('child_process');
-const Session = require('../session');
-
+const initSession = require('../utils/init-session');
 
 module.exports = class Pane {
   constructor({rows, cols, cwd, shell, shellArgs, splitDirection, activeUid, uid, parent}, rpc, fn) {
@@ -31,9 +29,8 @@ module.exports = class Pane {
           uid,
           shell: session.shell,
           pid: session.pty.pid
-        });    
+        });
       }
-      console.log('uid: ', this.uid, 'childs:', this.childs.size);
       fn(this);
     });
   }
@@ -49,48 +46,43 @@ module.exports = class Pane {
       opts.uid = recorded.uid;
       opts.cwd = recorded.cwd;
     }
-    new Pane(opts, this.rpc, pane => {
-      this.childs.add(pane);
-        win.sessions.set(pane.uid, pane);
-        pane.session.on('data', data => {
-          this.rpc.emit('session data', {uid: pane.uid, data});
-        });
+    this.childs.add(new Pane(opts, this.rpc, pane => {
+      win.sessions.set(pane.uid, pane);
+      pane.session.on('data', data => {
+        this.rpc.emit('session data', {uid: pane.uid, data});
+      });
 
-        pane.session.on('exit', () => {
-          if (!pane.root) {
-            pane.parent.childs.delete(pane);
-            if (pane.childs.size >= 1) {
-              console.log('curentPaneUid: ', pane.uid);
-              pane.childs.forEach(child => {
-                child.parent = pane.parent;
-                pane.parent.childs.add(child);
-              });
-              console.log('parentUid: ', pane.parent.uid);
-              console.log('uid: ', pane.parent.uid, 'childs:', pane.parent.childs.size);
-            }
+      pane.session.on('exit', () => {
+        if (!pane.root) {
+          pane.parent.childs.delete(pane);
+          if (pane.childs.size >= 1) {
+            pane.childs.forEach(child => {
+              child.parent = pane.parent;
+              pane.parent.childs.add(child);
+            });
           }
-        });
-        if (recorded) {
-          recorded.childs.forEach(pane => {
-            this.rpc.emit('pane restore', {uid: recorded.uid, pane});
-          });
         }
-    });
+      });
+      if (recorded) {
+        recorded.childs.forEach(pane => {
+          this.rpc.emit('pane restore', {uid: recorded.uid, pane});
+        });
+      }
+    }));
   }
 
   lastChild() {
     let cpt = 0;
-    let last = undefined;
+    let last;
     this.childs.forEach(child => {
       cpt++;
-      console.log('childUID: ',child.uid);
       if (cpt === this.childs.size) {
         last = child;
       }
     });
-    return last;      
+    return last;
   }
-  
+
   record(fn) {
     const pid = this.session.pty.pid;
     exec(`lsof -p ${pid} | grep cwd | tr -s ' ' | cut -d ' ' -f9-`, (err, cwd) => {
@@ -101,17 +93,8 @@ module.exports = class Pane {
         this.cwd = cwd;
       }
     });
-    
-    let pane = {};
-    if(this.root === true) {
-      pane = {uid: this.uid, cwd: this.cwd, type: 'PANE', root: this.root, childs: []};
-    } else {
-      pane = {uid: this.uid, cwd: this.cwd, type: 'PANE', root: this.root, direction: this.direction, childs: []};
-    }
-    // if(!this.root) {
-    // pane = {uid: this.uid, cwd: this.cwd, type: 'PANE', root: this.root, direction: this.direction, childs: []};
-    // }
-    // const pane = {uid: this.uid, cwd: this.cwd, type: 'PANE', root: this.root, direction: this.direction, childs: []};
+
+    const pane = {uid: this.uid, cwd: this.cwd, type: 'PANE', root: this.root, direction: this.direction, childs: []};
     this.childs.forEach(child => {
       child.record(state => {
         pane.childs.push(state);

app/win/record.js

@@ -32,8 +32,6 @@ module.exports.load = function () {
     // when opening create a new window
     app.createWindow();
   }
-  // app.createWindow();
-
   // start save scheduler
   this.save(wins.get());
 };

app/win/split.js

@@ -1,5 +1,3 @@
-const initSession = require('../utils/init-session');
-const Split = require('./split');
 const Pane = require('./pane');
 
 module.exports = class Tab {
@@ -8,13 +6,13 @@ module.exports = class Tab {
     this.window = window;
     fn(this);
   }
-  
+
   onRoot({rows, cols, cwd, shell, shellArgs, uid}, recorded) {
     if (recorded && recorded.root) {
       uid = recorded.root.uid;
       cwd = recorded.root.cwd;
     }
-    
+
     this.root = new Pane({rows, cols, cwd, shell, shellArgs, uid}, this.window.rpc, pane => {
       pane.root = true;
       this.window.sessions.set(pane.uid, pane);
@@ -37,7 +35,7 @@ module.exports = class Tab {
       }
     });
   }
-  
+
   onRootUpdate(pane) {
     this.root.childs.delete(pane);
     pane.toRoot();
@@ -67,7 +65,7 @@ module.exports = class Tab {
     const tab = {id: this.id, type: 'TAB', root: undefined};
     this.root.record(state => {
       tab.root = state;
-    }); 
+    });
     fn(tab);
   }
 

app/win/tab.js

@@ -198,7 +198,7 @@ module.exports = class Window extends BrowserWindow {
 
   onTab(opts, recorded) {
     const size = this.tabs.size;
-    this.tabs.add(new Tab(size + 1, this, (tab) => {
+    this.tabs.add(new Tab(size + 1, this, tab => {
       tab.onRoot(opts, recorded);
     }));
   }

app/win/window.js

@@ -44,7 +44,6 @@ export function restorePane(uid, pane) {
     dispatch({
       type: TERM_GROUP_REQUEST,
       effect: () => {
-        console.log(pane);
         rpc.emit('new split', {
           activeUid: uid,
           splitDirection: pane.direction,

lib/actions/term-groups.js

@@ -73,8 +73,6 @@ rpc.on('termgroup restore req', ({tab}) => {
 });
 
 rpc.on('pane restore', ({uid, pane}) => {
-  console.log('called');
-  console.log(pane);
   store_.dispatch(termGroupActions.restorePane(uid, pane));
 });