updated and cleaned up overviewer.py

- moved c_overviewer version checks into __init__.py
 - bare_console support (mostly) moved into util, slightly more sane
 - removed and updated a ton of old code

overviewer_core/__init__.py

@@ -0,0 +1,71 @@
+#
+# Code to check to make sure c_overviewer is built and working
+#
+
+import os.path
+import platform
+import traceback
+import sys
+
+import util
+
+def check_c_overviewer():
+    """Check to make sure c_overviewer works and is up-to-date. Prints
+    out a helpful error and returns 1 if something's wrong, returns 0
+    otherwise.
+    """
+    root_dir = util.get_program_path()
+    # make sure the c_overviewer extension is available
+    try:
+        import c_overviewer
+    except ImportError:
+        ## if this is a frozen windows package, the following error messages about
+        ## building the c_overviewer extension are not appropriate
+        if hasattr(sys, "frozen") and platform.system() == 'Windows':
+            print "Something has gone wrong importing the c_overviewer extension.  Please"
+            print "make sure the 2008 and 2010 redistributable packages from Microsoft"
+            print "are installed."
+            return 1
+
+        ## try to find the build extension
+        ext = os.path.join(root_dir, "overviewer_core", "c_overviewer.%s" % ("pyd" if platform.system() == "Windows" else "so"))
+        if os.path.exists(ext):
+            traceback.print_exc()
+            print ""
+            print "Something has gone wrong importing the c_overviewer extension.  Please"
+            print "make sure it is up-to-date (clean and rebuild)"
+            return 1
+
+        print "You need to compile the c_overviewer module to run Minecraft Overviewer."
+        print "Run `python setup.py build`, or see the README for details."
+        return 1
+
+    #
+    # make sure it's up-to-date
+    #
+
+    if hasattr(sys, "frozen"):
+        pass # we don't bother with a compat test since it should always be in sync
+    elif "extension_version" in dir(c_overviewer):
+        # check to make sure the binary matches the headers
+        if os.path.exists(os.path.join(root_dir, "overviewer_core", "src", "overviewer.h")):
+            with open(os.path.join(root_dir, "overviewer_core", "src", "overviewer.h")) as f:
+                lines = f.readlines()
+                lines = filter(lambda x: x.startswith("#define OVERVIEWER_EXTENSION_VERSION"), lines)
+                if lines:
+                    l = lines[0]
+                    if int(l.split()[2].strip()) != c_overviewer.extension_version():
+                        print "Please rebuild your c_overviewer module.  It is out of date!"
+                        return 1
+    else:
+        print "Please rebuild your c_overviewer module.  It is out of date!"
+        return 1
+    
+    # all good!
+    return 0
+
+# only check the module if we're not setup.py
+if not sys.argv[0].endswith("setup.py"):
+    ret = check_c_overviewer()
+    if ret > 0:
+        util.exit(ret)

overviewer_core/util.py

@@ -21,6 +21,7 @@ import imp
 import os
 import os.path
 import sys
+import platform
 from subprocess import Popen, PIPE
 import logging
 from cStringIO import StringIO
@@ -88,6 +89,33 @@ def findGitVersion():
         except Exception:
             return "unknown"
 
+def is_bare_console():
+    """Returns true if Overviewer is running in a bare console in
+    Windows, that is, if overviewer wasn't started in a cmd.exe
+    session.
+    """
+    if platform.system() == 'Windows':
+        try:
+            import ctypes
+            GetConsoleProcessList = ctypes.windll.kernel32.GetConsoleProcessList
+            num = GetConsoleProcessList(ctypes.byref(ctypes.c_int(0)), ctypes.c_int(1))
+            if (num == 1):
+                return True
+                
+        except Exception:
+            pass
+    return False
+
+def exit(ret=0):
+    """Drop-in replacement for sys.exit that will automatically detect
+    bare consoles and wait for user input before closing.
+    """
+    if ret and is_bare_console():
+        print
+        print "Press [Enter] to close this window."
+        raw_input()
+    sys.exit(ret)
+
 # http://docs.python.org/library/itertools.html
 def roundrobin(iterables):
     "roundrobin('ABC', 'D', 'EF') --> A D E B F C"