Merge branch 'icons-1621' into v2.2.0b1

# Conflicts:
#	eos/db/__init__.py
#	eos/db/gamedata/__init__.py
#	eos/db/gamedata/item.py
#	eos/gamedata.py
#	eve.db

scripts/jsonToSql.py

@@ -30,6 +30,10 @@ sys.path.insert(0, os.path.realpath(os.path.join(path, "..")))
 import json
 import argparse
 
+CATEGORIES_TO_REMOVE = [
+    30  # Apparel
+]
+
 def main(db, json_path):
     if os.path.isfile(db):
         os.remove(db)
@@ -56,7 +60,6 @@ def main(db, json_path):
         "dgmtypeattribs": eos.gamedata.Attribute,
         "dgmtypeeffects": eos.gamedata.ItemEffect,
         "dgmunits": eos.gamedata.Unit,
-        "icons": eos.gamedata.Icon,
         "evecategories": eos.gamedata.Category,
         "evegroups": eos.gamedata.Group,
         "invmetagroups": eos.gamedata.MetaGroup,
@@ -283,6 +286,16 @@ def main(db, json_path):
     eos.db.gamedata_engine.execute("UPDATE dgmtypeattribs SET value = 4.0 WHERE attributeID = ?", (1367,))
 
     eos.db.gamedata_engine.execute("UPDATE invtypes  SET published = 0 WHERE typeName LIKE '%abyssal%'")
+
+    print()
+    for x in CATEGORIES_TO_REMOVE:
+        cat = eos.db.gamedata_session.query(eos.gamedata.Category).filter(eos.gamedata.Category.ID == x).first()
+        print ("Removing Category: {}".format(cat.name))
+        eos.db.gamedata_session.delete(cat)
+
+    eos.db.gamedata_session.commit()
+    eos.db.gamedata_engine.execute("VACUUM")
+
     print("done")
 
 if __name__ == "__main__":