AstralTransRocketries/pymclevel
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

added generateAtPositionIter and waitForServerIter, yielding the server's output line by line.

Browse Source
This commit is contained in:
David Vierra 2011-09-23 16:22:36 -10:00
parent 8cc7dcf6d1
commit c3ec70bee1
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
infiniteworld.py
View File

@ -395,14 +395,19 @@ class MCServerChunkGenerator(object):
#chunks = [c for c in chunks if not inBox(c)] #chunks = [c for c in chunks if not inBox(c)]
self.generateAtPosition(tempWorld, tempDir, centercx, centercz) for p in self.generateAtPositionIter(tempWorld, tempDir, centercx, centercz):
yield startLength - len(chunks), startLength, p
i=0
for cx, cz in chunks: for cx, cz in chunks:
if tempWorld.containsChunk(cx, cz) and tempWorld.getChunk(cx,cz).TerrainPopulated: if tempWorld.containsChunk(cx, cz) and tempWorld.getChunk(cx,cz).TerrainPopulated:
self.copyChunkAtPosition(tempWorld, level, cx, cz) self.copyChunkAtPosition(tempWorld, level, cx, cz)
i+= 1
yield startLength - len(chunks) + i, startLength
else: else:
missingChunks.append((cx, cz)) missingChunks.append((cx, cz))
[(cx,cz) for (cx,cz) in chunks if tempWorld.containsChunk(cx,cz)]
if len(chunks) == len(missingChunks): if len(chunks) == len(missingChunks):
raise ChunkNotPresent, "Asked the generator to create {0} chunks and it didn't create any of them!".format(len(missingChunks)) raise ChunkNotPresent, "Asked the generator to create {0} chunks and it didn't create any of them!".format(len(missingChunks))
else: else:
@ -414,9 +419,13 @@ class MCServerChunkGenerator(object):
def waitForServer(self, proc): def waitForServer(self, proc):
return exhaust(self.waitForServerIter(proc))
def waitForServerIter(self, proc):
""" wait for the server to finish starting up, then stop it. """ """ wait for the server to finish starting up, then stop it. """
while proc.poll() is None: while proc.poll() is None:
line = proc.stderr.readline() line = proc.stderr.readline()
yield line.strip()
if "[INFO] Done" in line: if "[INFO] Done" in line:
proc.stdin.write("stop\n") proc.stdin.write("stop\n")
proc.wait() proc.wait()