dave/pyfa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 21 Wiki Activity

Fix item diff script

Browse Source
This commit is contained in:
DarkPhoenix
2020-10-25 00:11:56 +03:00
parent 5141a30e22
commit dab5d1f211
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
scripts/itemDiff.py
View File

@@ -134,7 +134,7 @@ def main(old, new, groups=True, effects=True, attributes=True, renames=True):
if grp in groupnames: if grp in groupnames:
name = groupnames[grp] name = groupnames[grp]
else: else:
query = 'SELECT groupName FROM invgroups WHERE groupID = ?' query = 'SELECT name FROM invgroups WHERE groupID = ?'
new_cursor.execute(query, (grp,)) new_cursor.execute(query, (grp,))
name = "" name = ""
for row in new_cursor: for row in new_cursor:
@@ -197,7 +197,7 @@ def main(old, new, groups=True, effects=True, attributes=True, renames=True):
for cursor, dictionary in ((old_cursor, old_itmdata), (new_cursor, new_itmdata)): for cursor, dictionary in ((old_cursor, old_itmdata), (new_cursor, new_itmdata)):
# Compose list of items we're interested in, filtered by category # Compose list of items we're interested in, filtered by category
query = 'SELECT it.typeID, it.groupID FROM invtypes AS it INNER JOIN invgroups AS ig ON it.groupID = ig.groupID INNER JOIN invcategories AS ic ON ig.categoryID = ic.categoryID WHERE it.published = 1 AND ic.categoryName IN ("Ship", "Module", "Charge", "Skill", "Drone", "Implant", "Subsystem", "Structure", "Structure Module", "Fighter")' query = 'SELECT it.typeID, it.groupID FROM invtypes AS it INNER JOIN invgroups AS ig ON it.groupID = ig.groupID INNER JOIN invcategories AS ic ON ig.categoryID = ic.categoryID WHERE it.published = 1 AND ic.name IN ("Ship", "Module", "Charge", "Skill", "Drone", "Implant", "Subsystem", "Structure", "Structure Module", "Fighter")'
cursor.execute(query) cursor.execute(query)
for row in cursor: for row in cursor:
itemid = row[0] itemid = row[0]
@@ -205,7 +205,7 @@ def main(old, new, groups=True, effects=True, attributes=True, renames=True):
# Initialize container for the data for each item with empty stuff besides groupID # Initialize container for the data for each item with empty stuff besides groupID
dictionary[itemid] = [groupID, set(), {}] dictionary[itemid] = [groupID, set(), {}]
# Add items filtered by group # Add items filtered by group
query = 'SELECT it.typeID, it.groupID FROM invtypes AS it INNER JOIN invgroups AS ig ON it.groupID = ig.groupID WHERE it.published = 1 AND ig.groupName IN ("Effect Beacon", "Ship Modifiers", "Mutaplasmids", "MassiveEnvironments", "Abyssal Hazards", "Non-Interactable Object")' query = 'SELECT it.typeID, it.groupID FROM invtypes AS it INNER JOIN invgroups AS ig ON it.groupID = ig.groupID WHERE it.published = 1 AND ig.name IN ("Effect Beacon", "Ship Modifiers", "Mutaplasmids", "MassiveEnvironments", "Abyssal Hazards", "Non-Interactable Object")'
cursor.execute(query) cursor.execute(query)
for row in cursor: for row in cursor:
itemid = row[0] itemid = row[0]
@@ -356,11 +356,11 @@ def main(old, new, groups=True, effects=True, attributes=True, renames=True):
findrenames(ren_attributes, query) findrenames(ren_attributes, query)
ren_categories = {} ren_categories = {}
query = 'SELECT categoryID, categoryName FROM invcategories' query = 'SELECT categoryID, name FROM invcategories'
findrenames(ren_categories, query) findrenames(ren_categories, query)
ren_groups = {} ren_groups = {}
query = 'SELECT groupID, groupName FROM invgroups' query = 'SELECT groupID, name FROM invgroups'
findrenames(ren_groups, query) findrenames(ren_groups, query)
ren_marketgroups = {} ren_marketgroups = {}