Tribes2/TSScraper
1
0
Fork 0
mirror of https://github.com/Ragora/TSScraper.git synced 2026-04-29 16:55:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fine tune datablock rules a little bit more and fix some bugs in the hierarchy recursion

Browse source
This commit is contained in:
Robert MacGregor 2016-04-22 02:32:37 -04:00
parent 84d321eabf
commit 71c92c1a43
1 changed files with 12 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

23
tsscraper.py
View file

@ -226,8 +226,8 @@ class TSScraper(object):
# Rules for verifying datablock information # Rules for verifying datablock information
_datablock_rules = { _datablock_rules = {
"tracerprojectiledata": { "tracerprojectiledata": {
"references": ["splash", "explosion", "sound"], "references": [ ],
"optional_references": [ ], "optional_references": [ "projectile", "item", "sound", "splash", "explosion" ],
"declared": [ ], "declared": [ ],
"checks": { "checks": {
"fizzletimems": (lambda x: x >= 0, "Cannot use negative fizzle time!") "fizzletimems": (lambda x: x >= 0, "Cannot use negative fizzle time!")
@ -237,14 +237,14 @@ class TSScraper(object):
"shapebaseimagedata": { "shapebaseimagedata": {
"references": [ ], "references": [ ],
"optional_references": [ ], "optional_references": [ ],
"declared": [ ], "declared": [ "shapefile" ],
"checks": { "checks": {
} }
}, },
"itemdata": { "itemdata": {
"references": [ ], "references": [ ],
"optional_references": [ ], "optional_references": [ "image" ],
"declared": [ ], "declared": [ ],
"checks": { "pickupradius": (lambda x: x >= 1, "Items should have >= 1 pickup radius.") "checks": { "pickupradius": (lambda x: x >= 1, "Items should have >= 1 pickup radius.")
} }
@ -745,22 +745,23 @@ class TSScraper(object):
process_parents(datablock, parent_classes) process_parents(datablock, parent_classes)
# Flip through each reference in the table # Flip through each reference in the table
for reference in self._datablock_rules[datablock.type]["references"]: references = self._datablock_rules[datablock.type]["references"] + self._datablock_rules[datablock.type]["optional_references"]
for reference in references:
found_reference = False found_reference = False
for parent in parent_classes: for parent in parent_classes:
# FIXME: Deal with datablock redeclarations? # FIXME: Deal with datablock redeclarations?
parent_datablock = datablock_list[parent][0] parent_datablock = datablock_list[parent][0]
if (reference in datablock.properties): if (reference in parent_datablock.properties):
if (datablock.properties[reference].lower() not in datablock_list.keys()): if (parent_datablock.properties[reference].lower() not in datablock_list.keys()):
print("Reference Warning: %s Datablock '%s' references '%s' in property '%s', which does not exist! (Declaration in %s, line %u)" % (datablock.type, datablock.name, datablock.properties[reference], reference, datablock.filepath, datablock.line)) print("Reference Warning: %s Datablock '%s' references '%s' in property '%s', which does not exist! (Declaration in %s, line %u)" % (datablock.type, datablock.name, datablock.properties[reference], reference, datablock.filepath, datablock.line))
break break
else: else:
found_reference = True found_reference = True
break break
if (found_reference is False): if (found_reference is False and reference in self._datablock_rules[datablock.type]["references"]):
print("Reference Warning: %s datablock '%s' has no '%s' declaration! (Declaration in %s, line %u)" % (datablock.type, datablock.name, reference, datablock.filepath, datablock.line)) print("Reference Warning: %s datablock '%s' has no '%s' declaration! (Declaration in %s, line %u)" % (datablock.type, datablock.name, reference, datablock.filepath, datablock.line))
# Check each declaration # Check each declaration
@ -771,12 +772,12 @@ class TSScraper(object):
# FIXME: Deal with datablock redeclarations? # FIXME: Deal with datablock redeclarations?
parent_datablock = datablock_list[parent][0] parent_datablock = datablock_list[parent][0]
if (declaration in datablock.properties): if (declaration in parent_datablock.properties):
found_declaration = True found_declaration = True
break break
if (found_declaration is False): if (found_declaration is False):
print("Declaration Warning: %s Datablock '%s' required property '%s' not declared! (Declaration in %s, line %u)" % (datablock.type, datablock.name, declaration, datablock.filepath, datablock.line)) print("Declaration Warning: %s Datablock '%s' required property '%s' not declared or inherited! (Declaration in %s, line %u)" % (datablock.type, datablock.name, declaration, datablock.filepath, datablock.line))
# Run custom checks # Run custom checks
for check in self._datablock_rules[datablock.type]["checks"].keys(): for check in self._datablock_rules[datablock.type]["checks"].keys():
@ -795,7 +796,7 @@ class TSScraper(object):
if (not method(parent_datablock.properties[check])): if (not method(parent_datablock.properties[check])):
print("Property Warning (Datablock '%s', type %s. Declaration in %s, line %u): %s" % (datablock.name, datablock.type, datablock.filepath, datablock.line, message)) print("Property Warning (Datablock '%s', type %s. Declaration in %s, line %u): %s" % (datablock.name, datablock.type, datablock.filepath, datablock.line, message))
break break
if (found_check is False): if (found_check is False):