cli: fix bug where configs would not completely pass through

Author: tony

tmuxp/cli.py

@@ -432,11 +432,11 @@ def command_import_teamocil(args):
         if os.path.exists(configfile):
             print(configfile)
             configparser.import_config(configfile)
+            newconfig = config.import_tmuxinator(configparser.get())
+            configparser.import_config(newconfig)
         else:
             sys.exit('File not found: %s' % configfile)
 
-        newconfig = config.import_teamocil(configparser.get())
-
         config_format = prompt_choices('Convert to', choices=[
                                        'yaml', 'json'], default='yaml')
 
@@ -518,11 +518,11 @@ def command_import_tmuxinator(args):
         if os.path.exists(configfile):
             print(configfile)
             configparser.import_config(configfile)
+            newconfig = config.import_tmuxinator(configparser.get())
+            configparser.import_config(newconfig)
         else:
             sys.exit('File not found: %s' % configfile)
 
-        newconfig = config.import_tmuxinator(configparser.get())
-
         config_format = prompt_choices('Convert to', choices=[
                                        'yaml', 'json'], default='yaml')
 

tmuxp/config.py

@@ -240,25 +240,31 @@ def import_tmuxinator(sconf):
 
     tmuxp_config = {}
 
+    logger.error(sconf)
+
     if 'project_name' in sconf:
-        tmuxp_config['session_name'] = sconf['project_name']
+        tmuxp_config['session_name'] = sconf.pop('project_name')
     elif 'name' in sconf:
-        tmuxp_config['session_name'] = sconf['name']
+        tmuxp_config['session_name'] = sconf.pop('name')
     else:
         tmuxp_config['session_name'] = None
 
+    logger.error(tmuxp_config)
+
     if 'cli_args' in sconf:
         tmuxp_config['config'] = sconf['cli_args']
 
         if '-f' in tmuxp_config['config']:
             tmuxp_config['config'] = tmuxp_config[
-                'config'].replace('-f', '').strip()
+                'config'
+            ].replace('-f', '').strip()
     elif 'tmux_options' in sconf:
         tmuxp_config['config'] = sconf['tmux_options']
 
         if '-f' in tmuxp_config['config']:
             tmuxp_config['config'] = tmuxp_config[
-                'config'].replace('-f', '').strip()
+                'config'
+            ].replace('-f', '').strip()
 
     if 'socket_name' in sconf:
         tmuxp_config['socket_name'] = sconf['socket_name']
@@ -267,7 +273,7 @@ def import_tmuxinator(sconf):
 
     if 'tabs' in sconf:
         sconf['windows'] = sconf.pop('tabs')
-
+    logger.error(tmuxp_config)
     if 'pre' in sconf and 'pre_window' in sconf:
         tmuxp_config['shell_command'] = sconf['pre']
 
@@ -287,7 +293,7 @@ def import_tmuxinator(sconf):
         tmuxp_config['shell_command_before'].append(
             'rbenv shell %s' % sconf['rbenv']
         )
-
+    logger.error(tmuxp_config)
     for w in sconf['windows']:
         for k, v in w.items():
 
@@ -312,10 +318,9 @@ def import_tmuxinator(sconf):
             if 'layout' in v:
                 windowdict['layout'] = v['layout']
             tmuxp_config['windows'].append(windowdict)
-
+    logger.error(tmuxp_config)
     return tmuxp_config
 
-
 def import_teamocil(sconf):
     '''Import yaml configs from `teamocil`_.