Merge pull request #25 from hexparrot/172compat

172compat

Author: hexparrot

mineos.py

@@ -132,6 +132,12 @@ def _set_environment(self):
             'sc_backup': os.path.join(self.env['bwd'], 'server.config')
             })
 
+        server_logs = [os.path.join('logs', 'latest.log'), 'server.log']
+        for i in server_logs:
+            path = os.path.join(self.env['cwd'], i)
+            if os.path.isfile(path):
+                self.env['log'] = path
+
     def _load_config(self, load_backup=False, generate_missing=False):
         """Loads server.properties and server.config for a given server.
         With load_backup, /backup/ is referred to rather than /servers/.
@@ -809,13 +815,29 @@ def bytesto(num, to, bsize=1024):
             return '%s MB' % bytesto(mem, 'm')
         except IOError:
             return '0'
-        
+   
     @property
     def ping(self):
         """Returns a named tuple using the current Minecraft protocol
         to retreive versions, player counts, etc"""
         import socket
 
+        def server_list_packet():
+            """Guesses what version minecraft a live server directory is."""
+            if self.env['log'].endswith('server.log'):
+                return '\xfe' \
+                       '\x01' \
+                       '\xfa' \
+                       '\x00\x06' \
+                       '\x00\x6d\x00\x69\x00\x6e\x00\x65\x00\x6f\x00\x73' \
+                       '\x00\x19' \
+                       '\x49' \
+                       '\x00\x09' \
+                       '\x00\x6c\x00\x6f\x00\x63\x00\x61\x00\x6c\x00\x68' \
+                       '\x00\x6f\x00\x73\x00\x74' \
+                       '\x00\x00\x63\xdd'
+            return '\xfe\x01'
+
         server_ping = namedtuple('ping', ['protocol_version',
                                           'server_version',
                                           'motd',
@@ -826,17 +848,7 @@ def ping(self):
             try:
                 s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
                 s.connect((self.ip_address, self.port))
-                s.send('\xfe'      #1
-                       '\x01'      #2
-                       '\xfa'      #3
-                       '\x00\x06'  #4
-                       '\x00\x6d\x00\x69\x00\x6e\x00\x65\x00\x6f\x00\x73'
-                       '\x00\x19'  #6
-                       '\x49'      #7
-                       '\x00\x09'  #8
-                       '\x00\x6c\x00\x6f\x00\x63\x00\x61\x00\x6c\x00\x68'
-                       '\x00\x6f\x00\x73\x00\x74'
-                       '\x00\x00\x63\xdd') #10
+                s.send(server_list_packet())
 
                 d = s.recv(1024)
                 s.shutdown(socket.SHUT_RDWR)
@@ -1244,11 +1256,11 @@ def list_last_loglines(self, lines=100):
         """Returns last n lines from logfile"""
         from procfs_reader import tail
 
-        logfiles =['server.log', os.path.join('logs', 'latest.log')]
+        logfiles = ['server.log', os.path.join('logs', 'latest.log')]
 
         for i in logfiles:
             try:
-                with open(os.path.join(self.env['cwd'], logfiles), 'rb') as log:
+                with open(os.path.join(self.env['cwd'], i), 'rb') as log:
                     return tail(log, int(lines))
             except IOError:
                 pass

stock_profiles.py

@@ -8,12 +8,12 @@
 __email__ = "wdchromium@gmail.com"
 
 STOCK_PROFILES = {
-    'vanilla162': {
-        'name': 'vanilla162',
+    'vanilla172': {
+        'name': 'vanilla172',
         'type': 'standard_jar',
-        'url': 'https://s3.amazonaws.com/Minecraft.Download/versions/1.6.2/minecraft_server.1.6.2.jar',
-        'save_as': 'minecraft_server.jar',
-        'run_as': 'minecraft_server.jar',
+        'url': 'https://s3.amazonaws.com/Minecraft.Download/versions/1.7.2/minecraft_server.1.7.2.jar',
+        'save_as': 'minecraft_server.1.7.2.jar',
+        'run_as': 'minecraft_server.1.7.2.jar',
         'ignore': '',
         'desc': 'official minecraft_server.jar'
         },