Merge branch 'master' into singularity

scripts/jsonToSql.py

@@ -25,11 +25,19 @@ import re
 
 # Add eos root path to sys.path so we can import ourselves
 path = os.path.dirname(__file__)
+<<<<<<< HEAD
 sys.path.insert(0, os.path.realpath(os.path.join(path, '..')))
+=======
+sys.path.insert(0, os.path.realpath(os.path.join(path, "..")))
+>>>>>>> master
 
 import json
 import argparse
 
+CATEGORIES_TO_REMOVE = [
+    30  # Apparel
+]
+
 def main(db, json_path):
     if os.path.isfile(db):
         os.remove(db)
@@ -50,6 +58,7 @@ def main(db, json_path):
 
     # Config dict
     tables = {
+<<<<<<< HEAD
         'clonegrades': eos.gamedata.AlphaCloneSkill,
         'dgmattribs': eos.gamedata.AttributeInfo,
         'dgmeffects': eos.gamedata.Effect,
@@ -65,6 +74,22 @@ def main(db, json_path):
         'phbtraits': eos.gamedata.Traits,
         'phbmetadata': eos.gamedata.MetaData,
         'mapbulk_marketGroups': eos.gamedata.MarketGroup,
+=======
+        "clonegrades": eos.gamedata.AlphaCloneSkill,
+        "dgmattribs": eos.gamedata.AttributeInfo,
+        "dgmeffects": eos.gamedata.Effect,
+        "dgmtypeattribs": eos.gamedata.Attribute,
+        "dgmtypeeffects": eos.gamedata.ItemEffect,
+        "dgmunits": eos.gamedata.Unit,
+        "evecategories": eos.gamedata.Category,
+        "evegroups": eos.gamedata.Group,
+        "invmetagroups": eos.gamedata.MetaGroup,
+        "invmetatypes": eos.gamedata.MetaType,
+        "evetypes": eos.gamedata.Item,
+        "phbtraits": eos.gamedata.Traits,
+        "phbmetadata": eos.gamedata.MetaData,
+        "mapbulk_marketGroups": eos.gamedata.MarketGroup,
+>>>>>>> master
     }
 
     fieldMapping = {
@@ -184,7 +209,11 @@ def main(db, json_path):
             tableData = convertIcons(tableData)
         if jsonName == 'phbtraits':
             tableData = convertTraits(tableData)
+<<<<<<< HEAD
         if jsonName == 'clonegrades':
+=======
+        if jsonName == "clonegrades":
+>>>>>>> master
             tableData = convertClones(tableData)
         data[jsonName] = tableData
 
@@ -252,6 +281,29 @@ def main(db, json_path):
 
                 eos.db.gamedata_session.add(instance)
 
+    # quick and dirty hack to get this data in
+    with open(os.path.join(jsonPath, "dynamicAttributes.json"), encoding="utf-8") as f:
+        bulkdata = json.load(f)
+        for mutaID, data in bulkdata.items():
+            muta = eos.gamedata.DynamicItem()
+            muta.typeID = mutaID
+            muta.resultingTypeID = data['inputOutputMapping'][0]['resultingType']
+            eos.db.gamedata_session.add(muta)
+
+            for x in data['inputOutputMapping'][0]['applicableTypes']:
+                item = eos.gamedata.DynamicItemItem()
+                item.typeID = mutaID
+                item.applicableTypeID = x
+                eos.db.gamedata_session.add(item)
+
+            for attrID, attrData in data['attributeIDs'].items():
+                attr = eos.gamedata.DynamicItemAttribute()
+                attr.typeID = mutaID
+                attr.attributeID = attrID
+                attr.min = attrData['min']
+                attr.max = attrData['max']
+                eos.db.gamedata_session.add(attr)
+
     eos.db.gamedata_session.commit()
 
     # CCP still has 5 subsystems assigned to T3Cs, even though only 4 are available / usable. They probably have some
@@ -259,8 +311,23 @@ def main(db, json_path):
     # pyfa, we can do it here as a post-processing step
     eos.db.gamedata_engine.execute('UPDATE dgmtypeattribs SET value = 4.0 WHERE attributeID = ?', (1367,))
 
+<<<<<<< HEAD
     eos.db.gamedata_engine.execute('UPDATE invtypes SET published = 0 WHERE typeName LIKE '%abyssal%'')
     print('done')
+=======
+    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")
+>>>>>>> master
 
 if __name__ == '__main__':
     parser = argparse.ArgumentParser(description='This scripts dumps effects from an sqlite cache dump to mongo')
@@ -269,3 +336,4 @@ if __name__ == '__main__':
     args = parser.parse_args()
 
     main(args.db, args.json)
+