Merge branch 'master' of https://github.com/kvimber/MCStation

Author: Kendrick

.gitignore

@@ -19,6 +19,7 @@
 /server/
 # ignore pass file
 /core/pass.txt
+/core/pass.mcs
 # ignore mapping system
 /mapper/
 # ignore binary files

core/mc_security.py

@@ -10,7 +10,7 @@
 import getpass
 
 SEPARATOR = ":::"
-FILENAME = "../core/pass.txt"
+FILENAME = "../core/pass.mcs"
 
 def get_creds(setting=False):
     user_name = raw_input("Username: ")

core/mc_server.py

@@ -20,30 +20,31 @@
 class MCServer:
 
     def __init__(self):
-        print "System initializing..."
+        print "MCStation initializing..."
         self.props = properties.PROPS
         self.p = None
         self.lock = threading.Lock()
         self.thread_id = 0
         self.check_platform()
         self.startup()
-        print "System initialized."
+        print "MCStation initialized."
 
     #Validates the users system and properties
     def startup(self):
-        # Checks to see if java is available
-        self.jtest = subprocess.Popen(shlex.split(self.java_cmd), stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-        (child_stdout, child_stderr) = self.jtest.communicate()
-        if(child_stderr.startswith("java version")):
-            print "Java found"
-        else:
-            raise RuntimeError("Unable to locate Java. Verify you have it installed and on your path")
-        # Checks to see if minecraft_server.jar can be found
-        if(os.path.exists(self.props[properties.PATH_SERVER] + "/minecraft_server.jar")):
-           print "Minecraft found"
+        self.check_java()
+        self.check_minecraft()
+        self.check_mapper()
+        self.check_auth_system()
+        # TODO: Check for mailer
+
+    def check_auth_system(self):
+        if not os.path.exists(mc_sec.FILENAME):
+            print "No authentication available, please create a new user below:"
+            mc_sec.add_new_user_to_pass_store()
         else:
-           raise RuntimeError("Unable to find minecraft_server.jar. Double check PROPS[PATH_SERVER] in properties.py")
-        
+            print "Authentication system ready."
+
+    def check_mapper(self):
         # Checks to see if mapping utility can be found.
         try:
             self.props[properties.CLI_RUNMAPPER]
@@ -61,7 +62,22 @@ def startup(self):
         else:
             print "Mapping software not found. Add mapper to properties.py if you want to enable mapping functionality"
 
-        # TODO: Check for mailer
+
+    def check_minecraft(self):
+        # Checks to see if minecraft_server.jar can be found
+        if(os.path.exists(self.props[properties.PATH_SERVER] + "/minecraft_server.jar")):
+           print "Minecraft found"
+        else:
+           raise RuntimeError("Unable to find minecraft_server.jar. Double check PROPS[PATH_SERVER] in properties.py")
+
+    def check_java(self):
+        # Checks to see if java is available
+        self.jtest = subprocess.Popen(shlex.split(self.java_cmd), stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+        (child_stdout, child_stderr) = self.jtest.communicate()
+        if(child_stderr.startswith("java version")):
+            print "Java found"
+        else:
+            raise RuntimeError("Unable to locate Java. Verify you have it installed and on your path")
 
     def start(self):
         if self.p is None:
@@ -161,6 +177,7 @@ def run_server(self):
                 print "Thread " + thread.name + " started..."
             except KeyboardInterrupt:
                 print "\nKeyboard Interrupt Occurred.  Exiting."
+                self.stop()
                 break
 
     def run_server_cmd(self, cmd):
@@ -293,7 +310,8 @@ def log(self, log_string):
 
 def main():
     server = MCServer()
-    print "Running server..."
+    print "Starting Minecraft server..."
+    server.start()
     server.run_server()