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

Rename presave->reversion

Browse Source
This commit is contained in:
David Vierra 2016-09-16 03:52:49 -10:00
parent c0cb29f9ac
commit fc7eab8906
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/mceditlib/revisionhistory.py
View File

@ -437,17 +437,17 @@ def copyToFolder(destFolder, sourceNode, presaveNode=None):
pass pass
def copyToFolderIter(destFolder, sourceNode, presaveNode=None): def copyToFolderIter(destFolder, sourceNode, reversionNode=None):
# Progress counts: # Progress counts:
# 0-10: deleted chunks # 0-10: deleted chunks
# 10-80: new/modified chunks # 10-80: new/modified chunks
# 80-90: deleted files # 80-90: deleted files
# 90-100: new/modified files # 90-100: new/modified files
if presaveNode: if reversionNode:
presaveFolder = presaveNode.worldFolder reversionFolder = reversionNode.worldFolder
else: else:
presaveFolder = None reversionFolder = None
sourceFolder = sourceNode.worldFolder sourceFolder = sourceNode.worldFolder
@ -458,8 +458,8 @@ def copyToFolderIter(destFolder, sourceNode, presaveNode=None):
yield deadProgress, maxprogress, "Removing deleted chunks" yield deadProgress, maxprogress, "Removing deleted chunks"
if destFolder.containsChunk(cx, cz, dimName): if destFolder.containsChunk(cx, cz, dimName):
if presaveFolder and not presaveFolder.containsChunk(cx, cz, dimName): if reversionFolder and not reversionFolder.containsChunk(cx, cz, dimName):
presaveFolder.writeChunkBytes(cx, cz, dimName, destFolder.readChunkBytes(cx, cz, dimName)) reversionFolder.writeChunkBytes(cx, cz, dimName, destFolder.readChunkBytes(cx, cz, dimName))
destFolder.deleteChunk(cx, cz, dimName) destFolder.deleteChunk(cx, cz, dimName)
# Write new and modified chunks # Write new and modified chunks
@ -473,11 +473,11 @@ def copyToFolderIter(destFolder, sourceNode, presaveNode=None):
for chunkProgress, (cx, cz) in enumProgress(cPos, progress, progress + dimProgress): for chunkProgress, (cx, cz) in enumProgress(cPos, progress, progress + dimProgress):
yield chunkProgress, maxprogress, "Writing new and modified chunks" yield chunkProgress, maxprogress, "Writing new and modified chunks"
if presaveFolder and not presaveFolder.containsChunk(cx, cz, dimName): if reversionFolder and not reversionFolder.containsChunk(cx, cz, dimName):
if destFolder.containsChunk(cx, cz, dimName): if destFolder.containsChunk(cx, cz, dimName):
presaveFolder.writeChunkBytes(cx, cz, dimName, destFolder.readChunkBytes(cx, cz, dimName)) reversionFolder.writeChunkBytes(cx, cz, dimName, destFolder.readChunkBytes(cx, cz, dimName))
else: # new chunk else: # new chunk
presaveNode.deleteChunk(cx, cz, dimName) reversionNode.deleteChunk(cx, cz, dimName)
destFolder.writeChunkBytes(cx, cz, dimName, sourceFolder.readChunkBytes(cx, cz, dimName)) destFolder.writeChunkBytes(cx, cz, dimName, sourceFolder.readChunkBytes(cx, cz, dimName))
# Remove deleted files # Remove deleted files
@ -485,8 +485,8 @@ def copyToFolderIter(destFolder, sourceNode, presaveNode=None):
yield delProgress, maxprogress, "Removing deleted files" yield delProgress, maxprogress, "Removing deleted files"
if destFolder.containsFile(path): if destFolder.containsFile(path):
if presaveFolder and not presaveFolder.containsFile(path): if reversionFolder and not reversionFolder.containsFile(path):
presaveFolder.writeFile(path, destFolder.readFile(path)) reversionFolder.writeFile(path, destFolder.readFile(path))
destFolder.deleteFile(path) destFolder.deleteFile(path)
# Write new and modified files # Write new and modified files
@ -495,11 +495,11 @@ def copyToFolderIter(destFolder, sourceNode, presaveNode=None):
for delProgress, path in enumProgress(files, 90, 10): for delProgress, path in enumProgress(files, 90, 10):
yield delProgress, maxprogress, "Writing new and modified files" yield delProgress, maxprogress, "Writing new and modified files"
if presaveFolder and not presaveFolder.containsFile(path): if reversionFolder and not reversionFolder.containsFile(path):
if destFolder.containsFile(path): if destFolder.containsFile(path):
presaveFolder.writeFile(path, destFolder.readFile(path)) reversionFolder.writeFile(path, destFolder.readFile(path))
else: # new file else: # new file
presaveNode.deleteFile(path) reversionNode.deleteFile(path)
destFolder.writeFile(path, sourceFolder.readFile(path)) destFolder.writeFile(path, sourceFolder.readFile(path))
yield maxprogress, maxprogress, "Done" yield maxprogress, maxprogress, "Done"