From d013a41079b9f76b1e60631e65f6b678cdfed066 Mon Sep 17 00:00:00 2001
From: blitzmann <ryan.xgamer99@gmail.com>
Date: Sat, 17 Oct 2015 21:47:55 -0400
Subject: [PATCH] Added CREST client data (for SISI), and rudimentary database
 support. Valid data has to be manually entered at this time, but the loading
 of the crest character works and uses pycrest correctly

---
 config.py                    | 5 +++++
 eos/db/__init__.py           | 2 +-
 eos/db/saveddata/__init__.py | 2 +-
 eos/db/saveddata/queries.py  | 8 +++++++-
 eos/types.py                 | 1 +
 5 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/config.py b/config.py
index 2a5071f5e..f298e5775 100644
--- a/config.py
+++ b/config.py
@@ -24,6 +24,11 @@ expansionName = "Vanguard"
 expansionVersion = "1.0"
 evemonMinVersion = "4081"
 
+# CREST client information
+clientID = '554727742a354f62ad9dfb34a188abc2'
+clientSecret = 'fyCksblVC4AHafeYI9XOcV44xi0AOnMLV8tEU45M'
+clientCallback = 'http://localhost:6461'
+
 pyfaPath = None
 savePath = None
 saveDB = None
diff --git a/eos/db/__init__.py b/eos/db/__init__.py
index 8867d63c5..9455dec37 100644
--- a/eos/db/__init__.py
+++ b/eos/db/__init__.py
@@ -75,7 +75,7 @@ from eos.db.saveddata.queries import getUser, getCharacter, getFit, getFitsWithS
                                      getFitList, getFleetList, getFleet, save, remove, commit, add, \
                                      getCharactersForUser, getMiscData, getSquadsIDsWithFitID, getWing, \
                                      getSquad, getBoosterFits, getProjectedFits, getTargetResistsList, getTargetResists,\
-                                     clearPrices, countAllFits
+                                     clearPrices, countAllFits, getCrestCharacters
 
 #If using in memory saveddata, you'll want to reflect it so the data structure is good.
 if config.saveddata_connectionstring == "sqlite:///:memory:":
diff --git a/eos/db/saveddata/__init__.py b/eos/db/saveddata/__init__.py
index 31e71c01a..c0677230d 100644
--- a/eos/db/saveddata/__init__.py
+++ b/eos/db/saveddata/__init__.py
@@ -1,3 +1,3 @@
-__all__ = ["character", "fit", "module", "user", "skill", "price",
+__all__ = ["character", "fit", "module", "user", "crest", "skill", "price",
            "booster", "drone", "implant", "fleet", "damagePattern",
            "miscData", "targetResists"]
diff --git a/eos/db/saveddata/queries.py b/eos/db/saveddata/queries.py
index b71f6b98a..68af39398 100644
--- a/eos/db/saveddata/queries.py
+++ b/eos/db/saveddata/queries.py
@@ -19,7 +19,7 @@
 
 from eos.db.util import processEager, processWhere
 from eos.db import saveddata_session, sd_lock
-from eos.types import User, Character, Fit, Price, DamagePattern, Fleet, MiscData, Wing, Squad, TargetResists
+from eos.types import User, Character, Fit, Price, DamagePattern, Fleet, MiscData, Wing, Squad, TargetResists, Crest
 from eos.db.saveddata.fleet import squadmembers_table
 from eos.db.saveddata.fit import projectedFits_table
 from sqlalchemy.sql import and_
@@ -416,6 +416,12 @@ def getProjectedFits(fitID):
     else:
         raise TypeError("Need integer as argument")
 
+def getCrestCharacters(eager=None):
+    eager = processEager(eager)
+    with sd_lock:
+        characters = saveddata_session.query(Crest).options(*eager).all()
+    return characters
+
 def removeInvalid(fits):
     invalids = [f for f in fits if f.isInvalid]
 
diff --git a/eos/types.py b/eos/types.py
index 6e98749d2..e4f1fd5e9 100644
--- a/eos/types.py
+++ b/eos/types.py
@@ -21,6 +21,7 @@ from eos.gamedata import Attribute, Category, Effect, Group, Icon, Item, MarketG
 MetaGroup, AttributeInfo, Unit, EffectInfo, MetaType, MetaData, Traits
 from eos.saveddata.price import Price
 from eos.saveddata.user import User
+from eos.saveddata.crest import Crest
 from eos.saveddata.damagePattern import DamagePattern
 from eos.saveddata.targetResists import TargetResists
 from eos.saveddata.character import Character, Skill