cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-09 16:14:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Error detection and framecount checks.

Browse Source
This commit is contained in:
Rob Nelson
2013-09-24 14:01:10 -07:00
parent 5ea23177fd
commit 9fcfc38332
3 changed files with 74 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
compareBayIcons.bat
View File

@@ -1 +1,2 @@
python tools/DMITool/DMI.py compare-all ../Baystation12/icons/ icons/
python tools/DMITool/DMI.py compare-all ../Baystation12/icons/ icons/
pause

64
compare_report.txt
View File

@@ -1,4 +1,24 @@
# DMITool Difference Report: C:\Users\Rob\Documents\Projects\Baystation12\icons C:\Users\Rob\Documents\Projects\vgstation13\icons
--- C:\Users\Rob\Documents\Projects\Baystation12\icons\robot_component.dmi
+++ C:\Users\Rob\Documents\Projects\vgstation13\icons\robot_component.dmi
C:\Users\Rob\Documents\Projects\Baystation12\icons\robot_component.dmi: Received error, continuing: Traceback (most recent call last):
File "tools/DMITool/DMI.py", line 109, in compare
theirsDMI.parse()
File "C:\Users\Rob\Documents\Projects\vgstation13\tools\DMITool\DMI\__init__.py", line 124, in parse
img = Image.open(self.filename)
File "C:\Python33\lib\site-packages\PIL\Image.py", line 1996, in open
raise IOError("cannot identify image file")
OSError: cannot identify image file
C:\Users\Rob\Documents\Projects\vgstation13\icons\robot_component.dmi: Received error, continuing: Traceback (most recent call last):
File "tools/DMITool/DMI.py", line 125, in compare
mineDMI.parse()
File "C:\Users\Rob\Documents\Projects\vgstation13\tools\DMITool\DMI\__init__.py", line 124, in parse
img = Image.open(self.filename)
File "C:\Python33\lib\site-packages\PIL\Image.py", line 1996, in open
raise IOError("cannot identify image file")
OSError: cannot identify image file
--- C:\Users\Rob\Documents\Projects\Baystation12\icons\effects\genetics.dmi
+++ C:\Users\Rob\Documents\Projects\vgstation13\icons\effects\genetics.dmi
- cold_l
@@ -31,6 +51,10 @@
--- C:\Users\Rob\Documents\Projects\Baystation12\icons\mecha\mecha_equipment.dmi
+++ C:\Users\Rob\Documents\Projects\vgstation13\icons\mecha\mecha_equipment.dmi
- mecha_phase_array
--- C:\Users\Rob\Documents\Projects\Baystation12\icons\misc\fullscreen.dmi
+++ C:\Users\Rob\Documents\Projects\vgstation13\icons\misc\fullscreen.dmi
- title: title: 8 frames, 1 directions icons: [None, None, None, None, None, None, None, None]
+ title: title: 5 frames, 1 directions icons: [None, None, None, None, None]
--- C:\Users\Rob\Documents\Projects\Baystation12\icons\mob\AI.dmi
+++ C:\Users\Rob\Documents\Projects\vgstation13\icons\mob\AI.dmi
- ai-banned
@@ -338,6 +362,26 @@
--- C:\Users\Rob\Documents\Projects\Baystation12\icons\obj\drinks.dmi
+++ C:\Users\Rob\Documents\Projects\vgstation13\icons\obj\drinks.dmi
- tea
--- C:\Users\Rob\Documents\Projects\Baystation12\icons\obj\gate.dmi
+++ C:\Users\Rob\Documents\Projects\vgstation13\icons\obj\gate.dmi
C:\Users\Rob\Documents\Projects\Baystation12\icons\obj\gate.dmi: Received error, continuing: Traceback (most recent call last):
File "tools/DMITool/DMI.py", line 109, in compare
theirsDMI.parse()
File "C:\Users\Rob\Documents\Projects\vgstation13\tools\DMITool\DMI\__init__.py", line 124, in parse
img = Image.open(self.filename)
File "C:\Python33\lib\site-packages\PIL\Image.py", line 1996, in open
raise IOError("cannot identify image file")
OSError: cannot identify image file
C:\Users\Rob\Documents\Projects\vgstation13\icons\obj\gate.dmi: Received error, continuing: Traceback (most recent call last):
File "tools/DMITool/DMI.py", line 125, in compare
mineDMI.parse()
File "C:\Users\Rob\Documents\Projects\vgstation13\tools\DMITool\DMI\__init__.py", line 124, in parse
img = Image.open(self.filename)
File "C:\Python33\lib\site-packages\PIL\Image.py", line 1996, in open
raise IOError("cannot identify image file")
OSError: cannot identify image file
--- C:\Users\Rob\Documents\Projects\Baystation12\icons\obj\items.dmi
+++ C:\Users\Rob\Documents\Projects\vgstation13\icons\obj\items.dmi
- rpd
@@ -458,6 +502,26 @@
- paramedic
+ sec_corporate
+ warden_corporate
--- C:\Users\Rob\Documents\Projects\Baystation12\icons\obj\pipes\large.dmi
+++ C:\Users\Rob\Documents\Projects\vgstation13\icons\obj\pipes\large.dmi
C:\Users\Rob\Documents\Projects\Baystation12\icons\obj\pipes\large.dmi: Received error, continuing: Traceback (most recent call last):
File "tools/DMITool/DMI.py", line 109, in compare
theirsDMI.parse()
File "C:\Users\Rob\Documents\Projects\vgstation13\tools\DMITool\DMI\__init__.py", line 124, in parse
img = Image.open(self.filename)
File "C:\Python33\lib\site-packages\PIL\Image.py", line 1996, in open
raise IOError("cannot identify image file")
OSError: cannot identify image file
C:\Users\Rob\Documents\Projects\vgstation13\icons\obj\pipes\large.dmi: Received error, continuing: Traceback (most recent call last):
File "tools/DMITool/DMI.py", line 125, in compare
mineDMI.parse()
File "C:\Users\Rob\Documents\Projects\vgstation13\tools\DMITool\DMI\__init__.py", line 124, in parse
img = Image.open(self.filename)
File "C:\Python33\lib\site-packages\PIL\Image.py", line 1996, in open
raise IOError("cannot identify image file")
OSError: cannot identify image file
--- C:\Users\Rob\Documents\Projects\Baystation12\icons\turf\areas.dmi
+++ C:\Users\Rob\Documents\Projects\vgstation13\icons\turf\areas.dmi
- xenocell1

10
tools/DMITool/DMI.py
View File

@@ -102,6 +102,7 @@ def compare(theirsfile, minefile, parser, reportstream):
theirs = []
mine = []
states = []
o = ''
if(os.path.isfile(theirsfile)):
try:
theirsDMI = DMI(theirsfile)
@@ -114,6 +115,7 @@ def compare(theirsfile, minefile, parser, reportstream):
sys.exit(1)
except Exception as e:
print("Received error, continuing: %s" % traceback.format_exc())
o += "\n {0}: Received error, continuing: {1}".format(theirsfile,traceback.format_exc())
for stateName in theirs:
if stateName not in states:
states.append(stateName)
@@ -129,17 +131,21 @@ def compare(theirsfile, minefile, parser, reportstream):
sys.exit(1)
except Exception as e:
print("Received error, continuing: %s" % traceback.format_exc())
o += "\n {0}: Received error, continuing: {1}".format(minefile,traceback.format_exc())
for stateName in mine:
if stateName not in states:
states.append(stateName)
o = ''
for state in sorted(states):
inTheirs = state in theirs
inMine = state in mine
if inTheirs and not inMine:
o += '\n + {1}'.format(minefile, state)
if not inTheirs and inMine:
elif not inTheirs and inMine:
o += '\n - {1}'.format(theirsfile, state)
elif inTheirs and inMine:
if theirs[state].ToString() != mine[state].ToString():
o += '\n - {0}: {1}'.format(state,mine[state].ToString())
o += '\n + {0}: {1}'.format(state,theirs[state].ToString())
if o != '':
reportstream.write('\n--- {0}'.format(theirsfile))
reportstream.write('\n+++ {0}'.format(minefile))