Merge pull request #5 from maryush/master

- fixed path to gnome-terminal

Author: gynvael

iface.cfg

@@ -0,0 +1,6 @@
+[main]
+secret = 
+home_path = /home/gynvael
+remote_ip_list = ( "192.168.56.1", "192.168.56.3" )
+bind_port = 33321
+terminal_cmd = /usr/bin/gnome-terminal

iface.py

@@ -69,16 +69,29 @@
 LOG_VERBOSE =  5
 LOG_DEBUG   = 10
 
+import os
+import pickle
+import select
+import socket
+import StringIO
+import struct
+import subprocess
+import sys
+import time
+import threading
+if sys.platform != 'win32':
+  import fcntl
+from ifaceconfiglib import cfg
+
 # -------------------------------------------------------------------
-# CONFIGURATION (please set this up before first use)
+# CONFIGURATION (set values from config file)
 # -------------------------------------------------------------------
 
-# Put some random string here. It will be used as poor man's authentication.
-# Please put the same string in ifaceclientlib.py
-SECRET = ""
-
-# Specify your default, fallback home directory at VM
-HOME_PATH_ON_VM="/home/gynvael"
+SECRET = cfg.get('main', 'secret')
+HOME_PATH_ON_VM = cfg.get('main', 'home_path')
+BIND_PORT = cfg.getInt('main', 'bind_port')
+TERMINAL_CMD = cfg.get('main', 'terminal_cmd')
+REMOTE_IP_LIST = eval(cfg.get('main', 'remote_ip_list'))
 
 CMDS={
     "iface-info"    : "CMD_iface_info", # Returns some info.
@@ -88,31 +101,11 @@
     "translate-path": "CMD_translate_path", # Translates path.
     }
 
-# TODO move this to some kind of config.
-# TODO do the same in ifaceclientlib.py
-# IPs of HOST and VM (in that order)
-REMOTE_IP_LIST = ( "192.168.56.1", "192.168.56.3" )
-BIND_PORT = 33321
-
 LOG_LEVEL = LOG_DEBUG
-
 # -------------------------------------------------------------------
 # End of constants / configs.
 # -------------------------------------------------------------------
 
-import os
-import pickle
-import select
-import socket
-import StringIO
-import struct
-import subprocess
-import sys
-import time
-import threading
-if sys.platform != 'win32':
-  import fcntl
-
 print "Windows/Linux iface by gynvael.coldwind//vx"
 
 def Usage():
@@ -123,8 +116,7 @@ def Usage():
 if len(SECRET) == 0:
   print "This is your time running Windows/Linux iface. You first need to set "
   print "some things up before you can use it."
-  print "Please open iface.py and ifaceclientlib.py and read the top comments on"
-  print "how to begin."
+  print "Please open iface.cfg and set needed values."
   sys.exit(1)
 
 if len(sys.argv) != 2:
@@ -1348,7 +1340,7 @@ def translate_path_to_linux(path):
   if not path[0].upper() in ['C', 'D', 'E', 'I', 'W', 'B']:
 
     # Nothing we can do.
-    path = "/home/gynvael/"
+    path = HOME_PATH_ON_VM
 
     # Done.
     Log(LOG_INFO, "translate-path: [!] \"%s\" -> \"%s\"" % (
@@ -1472,7 +1464,7 @@ def CMD_l_cmd(info, cwd):
 
   # Spawn the terminal.
   cwd = cwd.replace("'", "\\'")
-  command = "(cd '%s'; /usr/local/bin/gnome-terminal &)" % cwd
+  command = "(cd '%s'; %s &)" % (cwd, TERMINAL_CMD)
 
   # Spawn.
   if subprocess.call(command, shell=True) == 0:

ifaceclientlib.py

@@ -16,6 +16,7 @@
 import struct
 import sys
 import threading
+from ifaceconfiglib import cfg 
 
 # Constants for debug level in CONFIGURATION section.
 LOG_ERROR   =  0
@@ -25,17 +26,12 @@
 LOG_DEBUG   = 10
 
 # -------------------------------------------------------------------
-# CONFIGURATION (please set this up before first use)
+# CONFIGURATION (set values from config file)
 # -------------------------------------------------------------------
 
-# Put some random string here. It will be used as poor man's authentication.
-# Please put the same string in iface.py
-SECRET = ""  
-
-# TODO move this to some kind of config.
-# TODO do the same in iface.py
-# IPs of HOST and VM (in that order)
-BIND_PORT = 33321
+SECRET = cfg.get('main', 'secret')
+BIND_PORT = cfg.getInt('main', 'bind_port')
+ 
 LOG_LEVEL = LOG_DEBUG
 
 # -------------------------------------------------------------------
@@ -45,8 +41,7 @@
 if len(SECRET) == 0:
   print "This is your time running Windows/Linux iface. You first need to set "
   print "some things up before you can use it."
-  print "Please open iface.py and ifaceclientlib.py and read the top comments on"
-  print "how to begin."
+  print "Please open iface.cfg and set needed values."
   sys.exit(1)
 
 # -------------------------------------------------------------------

ifaceconfiglib.py

@@ -0,0 +1,40 @@
+# -*- coding: utf-8 -*-
+__author__ = 'Mariusz "maryush" Witkowski'
+
+import os
+import sys
+import ConfigParser
+
+config_file = os.path.dirname(__file__)+os.sep+"iface.cfg"
+
+class Config(object):
+    """basic operations on config file"""
+    cfg = None
+
+    def __init__(self, config_file):
+        """class initialization"""
+        if not config_file:
+            config_file = config_file
+
+        self.cfg = ConfigParser.RawConfigParser()
+        self.cfg.read(config_file)
+
+    def get(self, section, name):
+        """read value from selected section"""
+        try:
+            value = self.cfg.get(section, name)
+        except:
+            value = None
+        finally:
+            return value
+
+    def getBoolean(self, section, name):
+        """getting boolean value"""
+        return self.cfg.getboolean(section, name)
+
+    def getInt(self, section, name):
+        """getting int value"""
+        return self.cfg.getint(section, name)
+
+
+cfg = Config(config_file)