update database from master

Conflicts:
	service/prefetch.py

.codecov.yml

@@ -0,0 +1,26 @@
+codecov:
+  notify:
+    require_ci_to_pass: yes
+
+coverage:
+  precision: 2
+  round: down
+  range: "70...100"
+
+  status:
+    project: yes
+    patch: yes
+    changes: no
+
+parsers:
+  gcov:
+    branch_detection:
+      conditional: yes
+      loop: yes
+      method: no
+      macro: no
+
+comment:
+  layout: "header, diff"
+  behavior: default
+  require_changes: no

.gitattributes

@@ -0,0 +1,40 @@
+# Set the default behavior, in case people don't have core.autocrlf set.
+* text=auto
+
+# Explicitly declare text files you want to always be normalized and converted
+# to native line endings on checkout.
+# *.c text
+# *.h text
+
+# Declare files that will always have CRLF line endings on checkout.
+# Source files
+# ============
+*.pxd		text eol=crlf
+*.py 		text eol=crlf
+*.py3 		text eol=crlf
+*.pyw 		text eol=crlf
+*.pyx  		text eol=crlf
+
+
+# Denote all files that are truly binary and should not be modified.
+# Binary files
+# ============
+*.db		binary
+*.p 		binary
+*.pkl 		binary
+*.pyc 		binary
+*.pyd		binary
+*.pyo 		binary
+
+# Note: .db, .p, and .pkl files are associated
+# with the python modules ``pickle``, ``dbm.*``,
+# ``shelve``, ``marshal``, ``anydbm``, & ``bsddb``
+# (among others).
+
+# Denote all files that are truly binary and should not be modified.
+# Image files
+# ============
+*.png binary
+*.jpg binary
+*.icns binary
+*.ico binary

.gitignore

@@ -4,20 +4,117 @@
 #Kwrite/Gedit/Other crapapps making backups
 *~
 
-#Eclipse
-.project
-.pydevproject
-.settings
-
 #Patch files
 *.patch
 
 #Personal
 /saveddata/
 
-#PyCharm
-.idea/
-
 #Pyfa file
 pyfaFits.html
+
+#Temporary files
+*.py__jb_tmp__
+
+# Based on https://github.com/github/gitignore
+
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+env/
 build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+*.egg-info/
+.installed.cfg
+*.egg
+Pyfa.egg-info/
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*,cover
+.hypothesis/
+
+# Translations
+*.mo
+*.pot
+
+# Django stuff:
+*.log
+local_settings.py
+
+# Flask stuff:
+instance/
+.webassets-cache
+
+# Scrapy stuff:
+.scrapy
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+target/
+
+# IPython Notebook
+.ipynb_checkpoints
+
+# pyenv
+.python-version
+
+# celery beat schedule file
+celerybeat-schedule
+
+# dotenv
+.env
+
+# virtualenv
+.venv/
+venv/
+ENV/
+
+# Spyder project settings
+.spyderproject
+
+# Rope project settings
+.ropeproject
+
+# Eclipse project settings
+.project
+.pydevproject
+.settings
+
+# Pycharm project settings
+.idea
+eos.iml

.travis.yml

@@ -0,0 +1,25 @@
+language: python
+python:
+  - '2.7'
+env:
+  - TOXENV=pep8
+addons:
+  apt:
+    packages:
+      # for wxPython:
+      - python-wxgtk2.8
+      - python-wxtools
+      - wx2.8-doc
+      - wx2.8-examples
+      - wx2.8-headers
+      - wx2.8-i18n
+before_install:
+  - pip install -U tox
+install:
+  - pip install -r requirements.txt
+  - pip install -r requirements_test.txt
+script:
+  - tox
+  - py.test --cov=./
+after_success:
+  - bash <(curl -s https://codecov.io/bash)

README.md

@@ -1,6 +1,6 @@
 # pyfa
 
-[![Join the chat at https://gitter.im/pyfa-org/Pyfa](https://badges.gitter.im/pyfa-org/Pyfa.svg)](https://gitter.im/pyfa-org/Pyfa?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+[![Join us on Slack!](https://pyfainvite.azurewebsites.net/badge.svg)](https://pyfainvite.azurewebsites.net/)
 
 ![pyfa](https://cloud.githubusercontent.com/assets/3904767/10271512/af385ef2-6ade-11e5-8f67-52b8b1e4c797.PNG)
 
@@ -9,50 +9,59 @@
 pyfa, short for **py**thon **f**itting **a**ssistant, allows you to create, experiment with, and save ship fittings without being in game. Open source and written in Python, it is available on any platform where Python 2.x and wxWidgets are available, including Windows, Mac OS X, and Linux.
 
 ## Latest Version and Changelogs
-The latest version along with release notes can always be found on the projects [Releases](https://github.com/DarkFenX/Pyfa/releases) page. pyfa will notify you if you are running an outdated version.
+The latest version along with release notes can always be found on the project's [Releases](https://github.com/DarkFenX/Pyfa/releases) page. pyfa will notify you if you are running an outdated version.
 
-## Installing
-Windows and OS X users are supplied self-contained builds of pyfa that can be run without additional software. An `.exe` installer is also available for the Windows builds. There is no self-contained package for Linux users, which are expected to run pyfa through their distributions Python interpreter. However, there are a number of third-party packages available that handle the dependencies and updates for pyfa (for example, [pyfa for Arch Linux](https://aur.archlinux.org/packages/pyfa/)). Please check your distributions repositories.
+## Installation
+Windows and OS X users are supplied self-contained builds of pyfa on the [latest releases](https://github.com/pyfa-org/Pyfa/releases/latest) page. An `.exe` installer is also available for Windows builds. Linux users can run pyfa using their distribution's Python interpreter. There is no official self-contained package for Linux, however, there are a number of third-party packages available through distribution-specific repositories.
 
-### Requirements
-If you wish to help with development or simply need to run pyfa through a Python interpreter, the following software is required:
+#### OS X
+There are two different distributives for OS X: `-mac` and `-mac-deprecated`. 
 
-* Python 2.7
-* `wxPython` 2.8/3.0
-* `sqlalchemy` >= 0.6
-* `dateutil`
-* `matplotlib` (for some Linux distributions, you may need to install separate wxPython bindings, such as `python-matplotlib-wx`)
-* `requests`
+* `-mac`: based on wxPython 3.0.2.0 and has updated libraries. This is the recommended build.
+* `-mac-deprecated`: utilizes older binaries running on wxPython 2.8; because of this, some features are not available (currently CREST support and Attribute Overrides). Additionally, as development happens primarily on wxPython 3.0, a few GUI bugs may pop up as `-mac-deprecated` is not actively tested. However, due to some general issues with wxPython 3.0, especially on some newer OS X versions, `-mac-deprecated` is still offered for those that need it.
+
+There is also a [Homebrew](http://brew.sh) option for installing pyfa on OS X. Please note this is maintained by a third-party and is not tested by pyfa developers. Simply fire up in terminal:
+```
+$ brew install Caskroom/cask/pyfa
+```
 
 ### Linux Distro-specific Packages
-The following is a list of pyfa packages available for certain distros. Please note that these packages are maintained by third-parties and are not evaluated by the pyfa developers.
+The following is a list of pyfa packages available for certain distributions. Please note that these packages are maintained by third-parties and are not evaluated by the pyfa developers.
 
 * Debian/Ubuntu/derivitives: https://github.com/AdamMajer/Pyfa/releases
 * Arch: https://aur.archlinux.org/packages/pyfa/
 * openSUSE: https://build.opensuse.org/package/show/home:rmk2/pyfa
-* FreeBSD: http://www.freshports.org/games/pyfa/ (see #484 for instructions)
+* FreeBSD: http://www.freshports.org/games/pyfa/ (see [#484](https://github.com/pyfa-org/Pyfa/issues/484) for instructions)
+
+### Dependencies
+If you wish to help with development or simply need to run pyfa through a Python interpreter, the following software is required:
+
+* Python 2.7
+* `wxPython` 2.8/3.0
+* `sqlalchemy` >= 1.0.5
+* `dateutil`
+* `matplotlib` (for some Linux distributions you may need to install separate wxPython bindings such as `python-matplotlib-wx`)
+* `requests`
 
 ## Bug Reporting
-The preferred method of reporting bugs is through the projects GitHub Issues interface. Alternatively, posting a report in the pyfa thread on the official EVE Online forums is acceptable. Guidelines for bug reporting can be found on [this wiki page](https://github.com/DarkFenX/Pyfa/wiki/Bug-Reporting). 
+The preferred method of reporting bugs is through the project's [GitHub Issues interface](https://github.com/pyfa-org/Pyfa/issues). Alternatively, posting a report in the [pyfa thread](http://forums.eveonline.com/default.aspx?g=posts&t=247609) on the official EVE Online forums is acceptable. Guidelines for bug reporting can be found on [this wiki page](https://github.com/DarkFenX/Pyfa/wiki/Bug-Reporting). 
 
 ## License
 pyfa is licensed under the GNU GPL v3.0, see LICENSE
 
 ## Resources
-* Development repository: [http://github.com/DarkFenX/Pyfa](http://github.com/DarkFenX/Pyfa)
+* Development repository: [https://github.com/pyfa-org/Pyfa](https://github.com/pyfa-org/Pyfa)
 * XMPP conference: [pyfa@conference.jabber.org](pyfa@conference.jabber.org)
 * [EVE forum thread](http://forums.eveonline.com/default.aspx?g=posts&t=247609)
 * [EVE University guide using pyfa](http://wiki.eveuniversity.org/Guide_to_using_PYFA)
 * [EVE Online website](http://www.eveonline.com/)
 
 ## Contacts:
-* Kadesh Priestess
-    * GitHub: @DarkFenX
-    * [TweetFleet Slack](https://www.fuzzwork.co.uk/tweetfleet-slack-invites/): @kadesh
 * Sable Blitzmann
     * GitHub: @blitzmann
     * [TweetFleet Slack](https://www.fuzzwork.co.uk/tweetfleet-slack-invites/): @blitzmann
+    * [Gitter chat](https://gitter.im/pyfa-org/Pyfa): @ blitzmann
     * Email: sable.blitzmann@gmail.com
 
 ## CCP Copyright Notice
-EVE Online, the EVE logo, EVE and all associated logos and designs are the intellectual property of CCP hf. All artwork, screenshots, characters, vehicles, storylines, world facts or other recognizable features of the intellectual property relating to these trademarks are likewise the intellectual property of CCP hf. EVE Online and the EVE logo are the registered trademarks of CCP hf. All rights are reserved worldwide. All other trademarks are the property of their respective owners. CCP hf. has granted permission to Osmium to use EVE Online and all associated logos and designs for promotional and information purposes on its website but does not endorse, and is not in any way affiliated with, Osmium. CCP is in no way responsible for the content on or functioning of this website, nor can it be liable for any damage arising from the use of this website.
+EVE Online, the EVE logo, EVE and all associated logos and designs are the intellectual property of CCP hf. All artwork, screenshots, characters, vehicles, storylines, world facts or other recognizable features of the intellectual property relating to these trademarks are likewise the intellectual property of CCP hf. EVE Online and the EVE logo are the registered trademarks of CCP hf. All rights are reserved worldwide. All other trademarks are the property of their respective owners. CCP hf. has granted permission to pyfa to use EVE Online and all associated logos and designs for promotional and information purposes on its website but does not endorse, and is not in any way affiliated with, pyfa. CCP is in no way responsible for the content on or functioning of this program, nor can it be liable for any damage arising from the use of this program.

config.py

@@ -18,10 +18,10 @@ debug = False
 saveInRoot = False
 
 # Version data
-version = "1.20.2"
+version = "1.26.1"
 tag = "git"
-expansionName = "March 2016"
-expansionVersion = "1.3"
+expansionName = "YC118.10"
+expansionVersion = "1.2"
 evemonMinVersion = "4081"
 
 pyfaPath = None
@@ -31,18 +31,20 @@ gameDB = None
 
 
 class StreamToLogger(object):
-   """
-   Fake file-like stream object that redirects writes to a logger instance.
-   From: http://www.electricmonk.nl/log/2011/08/14/redirect-stdout-and-stderr-to-a-logger-in-python/
-   """
-   def __init__(self, logger, log_level=logging.INFO):
-      self.logger = logger
-      self.log_level = log_level
-      self.linebuf = ''
+    """
+    Fake file-like stream object that redirects writes to a logger instance.
+    From: http://www.electricmonk.nl/log/2011/08/14/redirect-stdout-and-stderr-to-a-logger-in-python/
+    """
+
+    def __init__(self, logger, log_level=logging.INFO):
+        self.logger = logger
+        self.log_level = log_level
+        self.linebuf = ''
+
+    def write(self, buf):
+        for line in buf.rstrip().splitlines():
+            self.logger.log(self.log_level, line.rstrip())
 
-   def write(self, buf):
-      for line in buf.rstrip().splitlines():
-         self.logger.log(self.log_level, line.rstrip())
 
 def isFrozen():
     if hasattr(sys, 'frozen'):
@@ -50,16 +52,12 @@ def isFrozen():
     else:
         return False
 
-def getPyfaRoot():
-    base = getattr(sys.modules['__main__'], "__file__", sys.executable) if isFrozen() else sys.argv[0]
-    root = os.path.dirname(os.path.realpath(os.path.abspath(base)))
-    root = unicode(root, sys.getfilesystemencoding())
-    return root
 
 def __createDirs(path):
     if not os.path.exists(path):
         os.makedirs(path)
 
+
 def defPaths(customSavePath):
     global debug
     global pyfaPath
@@ -77,32 +75,32 @@ def defPaths(customSavePath):
     # Python 2.X uses ANSI by default, so we need to convert the character encoding
     pyfaPath = getattr(configforced, "pyfaPath", pyfaPath)
     if pyfaPath is None:
-        pyfaPath = getPyfaRoot()
+        pyfaPath = getPyfaPath()
 
     # Where we store the saved fits etc, default is the current users home directory
     if saveInRoot is True:
         savePath = getattr(configforced, "savePath", None)
         if savePath is None:
-            savePath = os.path.join(pyfaPath, "saveddata")
+            savePath = getPyfaPath("saveddata")
     else:
         savePath = getattr(configforced, "savePath", None)
         if savePath is None:
-            if customSavePath is None: # customSavePath is not overriden
-                savePath = unicode(os.path.expanduser(os.path.join("~", ".pyfa")),
-                               sys.getfilesystemencoding())
+            if customSavePath is None:  # customSavePath is not overriden
+                savePath = os.path.expanduser(os.path.join("~", ".pyfa"))
             else:
                 savePath = customSavePath
 
     __createDirs(savePath)
 
     if isFrozen():
-        os.environ["REQUESTS_CA_BUNDLE"] = os.path.join(pyfaPath, "cacert.pem")
-        os.environ["SSL_CERT_FILE"] = os.path.join(pyfaPath, "cacert.pem")
+        certName = "cacert.pem"
+        os.environ["REQUESTS_CA_BUNDLE"] = getPyfaPath(certName).encode('utf8')
+        os.environ["SSL_CERT_FILE"] = getPyfaPath(certName).encode('utf8')
 
-    format = '%(asctime)s %(name)-24s %(levelname)-8s %(message)s'
-    logging.basicConfig(format=format, level=logLevel)
-    handler = logging.handlers.RotatingFileHandler(os.path.join(savePath, "log.txt"), maxBytes=1000000, backupCount=3)
-    formatter = logging.Formatter(format)
+    loggingFormat = '%(asctime)s %(name)-24s %(levelname)-8s %(message)s'
+    logging.basicConfig(format=loggingFormat, level=logLevel)
+    handler = logging.handlers.RotatingFileHandler(getSavePath("log.txt"), maxBytes=1000000, backupCount=3)
+    formatter = logging.Formatter(loggingFormat)
     handler.setFormatter(formatter)
     logging.getLogger('').addHandler(handler)
 
@@ -114,23 +112,61 @@ def defPaths(customSavePath):
         sys.stdout = sl
 
         # This interferes with cx_Freeze's own handling of exceptions. Find a way to fix this.
-        #stderr_logger = logging.getLogger('STDERR')
-        #sl = StreamToLogger(stderr_logger, logging.ERROR)
-        #sys.stderr = sl
+        # stderr_logger = logging.getLogger('STDERR')
+        # sl = StreamToLogger(stderr_logger, logging.ERROR)
+        # sys.stderr = sl
 
     # The database where we store all the fits etc
-    saveDB = os.path.join(savePath, "saveddata.db")
+    saveDB = getSavePath("saveddata.db")
 
     # The database where the static EVE data from the datadump is kept.
     # This is not the standard sqlite datadump but a modified version created by eos
     # maintenance script
-    gameDB = os.path.join(pyfaPath, "eve.db")
+    gameDB = getPyfaPath("eve.db")
 
-    ## DON'T MODIFY ANYTHING BELOW ##
+    # DON'T MODIFY ANYTHING BELOW!
     import eos.config
 
-    #Caching modifiers, disable all gamedata caching, its unneeded.
+    # Caching modifiers, disable all gamedata caching, its unneeded.
     eos.config.gamedataCache = False
     # saveddata db location modifier, shouldn't ever need to touch this
     eos.config.saveddata_connectionstring = "sqlite:///" + saveDB + "?check_same_thread=False"
     eos.config.gamedata_connectionstring = "sqlite:///" + gameDB + "?check_same_thread=False"
+
+
+def getPyfaPath(Append=None):
+    base = getattr(sys.modules['__main__'], "__file__", sys.executable) if isFrozen() else sys.argv[0]
+    root = os.path.dirname(os.path.realpath(os.path.abspath(base)))
+
+    if Append:
+        path = parsePath(root, Append)
+    else:
+        path = parsePath(root)
+
+    return path
+
+
+def getSavePath(Append=None):
+    root = savePath
+
+    if Append:
+        path = parsePath(root, Append)
+    else:
+        path = parsePath(root)
+
+    return path
+
+
+def parsePath(root, Append=None):
+    if Append:
+        path = os.path.join(root, Append)
+    else:
+        path = root
+
+    if type(path) == str:  # leave unicode ones alone
+        try:
+            path = path.decode('utf8')
+        except UnicodeDecodeError:
+            path = path.decode('windows-1252')
+
+    return path

eos/__init__.py

@@ -1,6 +1,7 @@
 version = "0.2.3"
 tag = "git"
 
+
 def test():
     import tests.runTests
     import unittest

eos/capSim.py

@@ -1,12 +1,12 @@
 import heapq
-from math import sqrt, exp
 import time
-
+from math import sqrt, exp
 
 DAY = 24 * 60 * 60 * 1000
 
-def lcm(a,b):
-    n = a*b
+
+def lcm(a, b):
+    n = a * b
     while b:
         a, b = b, a % b
     return n / a
@@ -40,20 +40,19 @@ class CapSimulator(object):
         # relevant decimal digits of capacitor for LCM period optimization
         self.stability_precision = 1
 
-
     def scale_activation(self, duration, capNeed):
         for res in self.scale_resolutions:
             mod = duration % res
             if mod:
-                if mod > res/2.0:
-                    mod = res-mod
+                if mod > res / 2.0:
+                    mod = res - mod
                 else:
                     mod = -mod
 
-                if abs(mod) <= duration/100.0:
+                if abs(mod) <= duration / 100.0:
                     # only adjust if the adjustment is less than 1%
                     duration += mod
-                    capNeed += float(mod)/duration * capNeed
+                    capNeed += float(mod) / duration * capNeed
                     break
 
         return duration, capNeed
@@ -91,12 +90,12 @@ class CapSimulator(object):
         for (duration, capNeed, clipSize, disableStagger), amount in mods.iteritems():
             if self.stagger and not disableStagger:
                 if clipSize == 0:
-                    duration = int(duration/amount)
+                    duration = int(duration / amount)
                 else:
-                    stagger_amount = (duration*clipSize+10000)/(amount*clipSize)
+                    stagger_amount = (duration * clipSize + 10000) / (amount * clipSize)
                     for i in range(1, amount):
                         heapq.heappush(self.state,
-                                       [i*stagger_amount, duration,
+                                       [i * stagger_amount, duration,
                                         capNeed, 0, clipSize])
             else:
                 capNeed *= amount
@@ -109,13 +108,11 @@ class CapSimulator(object):
 
             heapq.heappush(self.state, [0, duration, capNeed, 0, clipSize])
 
-
         if disable_period:
             self.period = self.t_max
         else:
             self.period = period
 
-
     def run(self):
         """Run the simulation"""
 
@@ -135,13 +132,13 @@ class CapSimulator(object):
         capCapacity = self.capacitorCapacity
         tau = self.capacitorRecharge / 5.0
 
-        cap_wrap = capCapacity                # cap value at last period
-        cap_lowest = capCapacity            # lowest cap value encountered
-        cap_lowest_pre = capCapacity    # lowest cap value before activations
-        cap = capCapacity                         # current cap value
-        t_wrap = self.period                    # point in time of next period
+        cap_wrap = capCapacity  # cap value at last period
+        cap_lowest = capCapacity  # lowest cap value encountered
+        cap_lowest_pre = capCapacity  # lowest cap value before activations
+        cap = capCapacity  # current cap value
+        t_wrap = self.period  # point in time of next period
 
-        t_now = t_last = 0
+        t_last = 0
         t_max = self.t_max
 
         while 1:
@@ -150,7 +147,7 @@ class CapSimulator(object):
             if t_now >= t_max:
                 break
 
-            cap = ((1.0+(sqrt(cap/capCapacity)-1.0)*exp((t_last-t_now)/tau))**2)*capCapacity
+            cap = ((1.0 + (sqrt(cap / capCapacity) - 1.0) * exp((t_last - t_now) / tau)) ** 2) * capCapacity
 
             if t_now != t_last:
                 if cap < cap_lowest_pre:
@@ -182,7 +179,7 @@ class CapSimulator(object):
             if clipSize:
                 if shot % clipSize == 0:
                     shot = 0
-                    t_now += 10000    # include reload time
+                    t_now += 10000  # include reload time
             activation[0] = t_now
             activation[3] = shot
 
@@ -195,19 +192,17 @@ class CapSimulator(object):
 
         # calculate EVE's stability value
         try:
-            avgDrain = reduce(float.__add__, map(lambda x: x[2]/x[1], self.state), 0.0)
-            self.cap_stable_eve = 0.25 * (1.0 + sqrt(-(2.0 * avgDrain * tau - capCapacity)/capCapacity)) ** 2
+            avgDrain = reduce(float.__add__, map(lambda x: x[2] / x[1], self.state), 0.0)
+            self.cap_stable_eve = 0.25 * (1.0 + sqrt(-(2.0 * avgDrain * tau - capCapacity) / capCapacity)) ** 2
         except ValueError:
             self.cap_stable_eve = 0.0
 
-
         if cap > 0.0:
             # capacitor low/high water marks
             self.cap_stable_low = cap_lowest
             self.cap_stable_high = cap_lowest_pre
         else:
-            self.cap_stable_low =\
-            self.cap_stable_high = 0.0
+            self.cap_stable_low = \
+                self.cap_stable_high = 0.0
 
-
-        self.runtime = time.time()-start
+        self.runtime = time.time() - start

eos/config.py

@@ -1,11 +1,15 @@
-from os.path import realpath, join, dirname, abspath
 import sys
+from os.path import realpath, join, dirname, abspath
 
 debug = False
 gamedataCache = True
 saveddataCache = True
-gamedata_connectionstring = 'sqlite:///' + unicode(realpath(join(dirname(abspath(__file__)), "..", "eve.db")), sys.getfilesystemencoding())
-saveddata_connectionstring = 'sqlite:///' + unicode(realpath(join(dirname(abspath(__file__)), "..", "saveddata", "saveddata.db")), sys.getfilesystemencoding())
+gamedata_version = ""
+gamedata_connectionstring = 'sqlite:///' + unicode(realpath(join(dirname(abspath(__file__)), "..", "eve.db")),
+                                                   sys.getfilesystemencoding())
+saveddata_connectionstring = 'sqlite:///' + unicode(
+    realpath(join(dirname(abspath(__file__)), "..", "saveddata", "saveddata.db")), sys.getfilesystemencoding())
 
-#Autodetect path, only change if the autodetection bugs out.
+
+# Autodetect path, only change if the autodetection bugs out.
 path = dirname(unicode(__file__, sys.getfilesystemencoding()))

eos/db/__init__.py

@@ -1,4 +1,4 @@
-#===============================================================================
+# ===============================================================================
 # Copyright (C) 2010 Diego Duclos
 #
 # This file is part of eos.
@@ -15,7 +15,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with eos.  If not, see <http://www.gnu.org/licenses/>.
-#===============================================================================
+# ===============================================================================
 
 import threading
 
@@ -24,17 +24,20 @@ from sqlalchemy.orm import sessionmaker, scoped_session
 from sqlalchemy.ext.declarative import declarative_base
 from sqlalchemy import pool
 
-from eos import config
+
 import migration
+from eos import config
+
 
 class ReadOnlyException(Exception):
     pass
 
+
 gamedata_connectionstring = config.gamedata_connectionstring
 if callable(gamedata_connectionstring):
-    gamedata_engine = create_engine("sqlite://", creator=gamedata_connectionstring, echo = config.debug)
+    gamedata_engine = create_engine("sqlite://", creator=gamedata_connectionstring, echo=config.debug)
 else:
-    gamedata_engine = create_engine(gamedata_connectionstring, echo = config.debug)
+    gamedata_engine = create_engine(gamedata_connectionstring, echo=config.debug)
 
 gamedata_meta = MetaData()
 gamedata_meta.bind = gamedata_engine
@@ -44,8 +47,8 @@ gamedata_session = sessionmaker(bind=gamedata_engine, autoflush=False, expire_on
 # game db because we haven't reached gamedata_meta.create_all()
 try:
     config.gamedata_version = gamedata_session.execute(
-            "SELECT `field_value` FROM `metadata` WHERE `field_name` LIKE 'client_build'"
-        ).fetchone()[0]
+        "SELECT `field_value` FROM `metadata` WHERE `field_name` LIKE 'client_build'"
+    ).fetchone()[0]
 except:
     config.gamedata_version = None
 
@@ -63,19 +66,19 @@ if saveddata_connectionstring is not None:
 # Lock controlling any changes introduced to session
 sd_lock = threading.Lock()
 
-#Import all the definitions for all our database stuff
+# Import all the definitions for all our database stuff
 from eos.db.gamedata import *
 from eos.db.saveddata import *
 
-#Import queries
+# Import queries
 from eos.db.gamedata.queries import *
 from eos.db.saveddata.queries import *
 
-#If using in memory saveddata, you'll want to reflect it so the data structure is good.
+# If using in memory saveddata, you'll want to reflect it so the data structure is good.
 if config.saveddata_connectionstring == "sqlite:///:memory:":
     saveddata_meta.create_all()
 
+
 def rollback():
     with sd_lock:
         saveddata_session.rollback()
-

eos/db/gamedata/__init__.py

@@ -1,2 +1,2 @@
 __all__ = ["attribute", "category", "effect", "group", "metaData",
-           "icon", "item", "marketGroup", "metaGroup", "unit"]
+           "icon", "item", "marketGroup", "metaGroup", "unit", "alphaClones"]

eos/db/gamedata/alphaClones.py

@@ -0,0 +1,46 @@
+# ===============================================================================
+# Copyright (C) 2010 Diego Duclos
+#
+# This file is part of eos.
+#
+# eos is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation, either version 2 of the License, or
+# (at your option) any later version.
+#
+# eos is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with eos.  If not, see <http://www.gnu.org/licenses/>.
+# ===============================================================================
+
+from sqlalchemy import Column, String, Integer, Table, ForeignKey
+from sqlalchemy.orm import relation, mapper, synonym
+
+from eos.db import gamedata_meta
+from eos.types import AlphaClone, AlphaCloneSkill
+
+alphaclones_table = Table("alphaClones", gamedata_meta,
+                         Column("alphaCloneID", Integer, primary_key=True),
+                         Column("alphaCloneName", String),
+                        )
+
+alphacloneskskills_table = Table("alphaCloneSkills", gamedata_meta,
+                         Column("alphaCloneID", Integer, ForeignKey("alphaClones.alphaCloneID"), primary_key=True),
+                         Column("typeID", Integer, primary_key=True),
+                         Column("level", Integer),
+                         )
+
+mapper(AlphaClone, alphaclones_table,
+       properties={
+           "ID": synonym("alphaCloneID"),
+           "skills": relation(
+               AlphaCloneSkill,
+               cascade="all,delete-orphan",
+               backref="clone")
+       })
+
+mapper(AlphaCloneSkill, alphacloneskskills_table)

eos/db/gamedata/attribute.py

@@ -1,4 +1,4 @@
-#===============================================================================
+# ===============================================================================
 # Copyright (C) 2010 Diego Duclos
 #
 # This file is part of eos.
@@ -15,20 +15,22 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with eos.  If not, see <http://www.gnu.org/licenses/>.
-#===============================================================================
+# ===============================================================================
 
 from sqlalchemy import Table, Column, Integer, Float, Unicode, ForeignKey, String, Boolean
-from sqlalchemy.orm import relation, mapper, synonym, deferred
 from sqlalchemy.ext.associationproxy import association_proxy
-from eos.types import Attribute, Icon, AttributeInfo, Unit
+from sqlalchemy.orm import relation, mapper, synonym, deferred
+
 from eos.db import gamedata_meta
+from eos.types import Attribute, Icon, AttributeInfo, Unit
+
 typeattributes_table = Table("dgmtypeattribs", gamedata_meta,
-                         Column("value", Float),
-                         Column("typeID", Integer, ForeignKey("invtypes.typeID"), primary_key=True, index=True),
-                         Column("attributeID", ForeignKey("dgmattribs.attributeID"), primary_key=True))
+                             Column("value", Float),
+                             Column("typeID", Integer, ForeignKey("invtypes.typeID"), primary_key=True, index=True),
+                             Column("attributeID", ForeignKey("dgmattribs.attributeID"), primary_key=True))
 
 attributes_table = Table("dgmattribs", gamedata_meta,
-                         Column("attributeID", Integer, primary_key = True),
+                         Column("attributeID", Integer, primary_key=True),
                          Column("attributeName", String),
                          Column("defaultValue", Float),
                          Column("maxAttributeID", Integer, ForeignKey("dgmattribs.attributeID")),
@@ -40,14 +42,14 @@ attributes_table = Table("dgmattribs", gamedata_meta,
                          Column("unitID", Integer, ForeignKey("dgmunits.unitID")))
 
 mapper(Attribute, typeattributes_table,
-       properties = {"info": relation(AttributeInfo, lazy=False)})
+       properties={"info": relation(AttributeInfo, lazy=False)})
 
 mapper(AttributeInfo, attributes_table,
-       properties = {"icon" : relation(Icon),
-                     "unit": relation(Unit),
-                     "ID": synonym("attributeID"),
-                     "name": synonym("attributeName"),
-                     "description" : deferred(attributes_table.c.description)})
+       properties={"icon": relation(Icon),
+                   "unit": relation(Unit),
+                   "ID": synonym("attributeID"),
+                   "name": synonym("attributeName"),
+                   "description": deferred(attributes_table.c.description)})
 
 Attribute.ID = association_proxy("info", "attributeID")
 Attribute.name = association_proxy("info", "attributeName")

eos/db/gamedata/category.py

@@ -1,4 +1,4 @@
-#===============================================================================
+# ===============================================================================
 # Copyright (C) 2010 Diego Duclos
 #
 # This file is part of eos.
@@ -15,7 +15,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with eos.  If not, see <http://www.gnu.org/licenses/>.
-#===============================================================================
+# ===============================================================================
 
 from sqlalchemy import Column, String, Integer, ForeignKey, Boolean, Table
 from sqlalchemy.orm import relation, mapper, synonym, deferred
@@ -24,14 +24,14 @@ from eos.db import gamedata_meta
 from eos.types import Category, Icon
 
 categories_table = Table("invcategories", gamedata_meta,
-                         Column("categoryID", Integer, primary_key = True),
+                         Column("categoryID", Integer, primary_key=True),
                          Column("categoryName", String),
                          Column("description", String),
                          Column("published", Boolean),
                          Column("iconID", Integer, ForeignKey("icons.iconID")))
 
 mapper(Category, categories_table,
-       properties = {"icon" : relation(Icon),
-                     "ID" : synonym("categoryID"),
-                     "name" : synonym("categoryName"),
-                     "description" : deferred(categories_table.c.description)})
+       properties={"icon": relation(Icon),
+                   "ID": synonym("categoryID"),
+                   "name": synonym("categoryName"),
+                   "description": deferred(categories_table.c.description)})

eos/db/gamedata/effect.py

@@ -1,4 +1,4 @@
-#===============================================================================
+# ===============================================================================
 # Copyright (C) 2010 Diego Duclos
 #
 # This file is part of eos.
@@ -15,35 +15,35 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with eos.  If not, see <http://www.gnu.org/licenses/>.
-#===============================================================================
+# ===============================================================================
 
 from sqlalchemy import Column, String, Integer, Boolean, Table, ForeignKey
 from sqlalchemy.ext.associationproxy import association_proxy
 from sqlalchemy.orm import mapper, synonym, relation, deferred
-from eos.types import Effect, EffectInfo
+
 from eos.db import gamedata_meta
+from eos.types import Effect, EffectInfo
 
 typeeffects_table = Table("dgmtypeeffects", gamedata_meta,
                           Column("typeID", Integer, ForeignKey("invtypes.typeID"), primary_key=True, index=True),
                           Column("effectID", Integer, ForeignKey("dgmeffects.effectID"), primary_key=True))
 
 effects_table = Table("dgmeffects", gamedata_meta,
-                      Column("effectID", Integer, primary_key = True),
+                      Column("effectID", Integer, primary_key=True),
                       Column("effectName", String),
                       Column("description", String),
                       Column("published", Boolean),
                       Column("isAssistance", Boolean),
                       Column("isOffensive", Boolean))
 
-
 mapper(EffectInfo, effects_table,
-       properties = {"ID" : synonym("effectID"),
-                     "name" : synonym("effectName"),
-                     "description" : deferred(effects_table.c.description)})
+       properties={"ID": synonym("effectID"),
+                   "name": synonym("effectName"),
+                   "description": deferred(effects_table.c.description)})
 
 mapper(Effect, typeeffects_table,
-       properties = {"ID": synonym("effectID"),
-                     "info": relation(EffectInfo, lazy=False)})
+       properties={"ID": synonym("effectID"),
+                   "info": relation(EffectInfo, lazy=False)})
 
 Effect.name = association_proxy("info", "name")
 Effect.description = association_proxy("info", "description")

eos/db/gamedata/group.py

@@ -1,4 +1,4 @@
-#===============================================================================
+# ===============================================================================
 # Copyright (C) 2010 Diego Duclos
 #
 # This file is part of eos.
@@ -15,7 +15,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with eos.  If not, see <http://www.gnu.org/licenses/>.
-#===============================================================================
+# ===============================================================================
 
 from sqlalchemy import Column, String, Integer, Boolean, ForeignKey, Table
 from sqlalchemy.orm import relation, mapper, synonym, deferred
@@ -24,7 +24,7 @@ from eos.db import gamedata_meta
 from eos.types import Group, Icon, Category
 
 groups_table = Table("invgroups", gamedata_meta,
-                     Column("groupID", Integer, primary_key = True),
+                     Column("groupID", Integer, primary_key=True),
                      Column("groupName", String),
                      Column("description", String),
                      Column("published", Boolean),
@@ -32,8 +32,8 @@ groups_table = Table("invgroups", gamedata_meta,
                      Column("iconID", Integer, ForeignKey("icons.iconID")))
 
 mapper(Group, groups_table,
-       properties = {"category" : relation(Category, backref = "groups"),
-                     "icon" : relation(Icon),
-                     "ID" : synonym("groupID"),
-                     "name" : synonym("groupName"),
-                     "description" : deferred(groups_table.c.description)})
+       properties={"category": relation(Category, backref="groups"),
+                   "icon": relation(Icon),
+                   "ID": synonym("groupID"),
+                   "name": synonym("groupName"),
+                   "description": deferred(groups_table.c.description)})

eos/db/gamedata/icon.py

@@ -1,4 +1,4 @@
-#===============================================================================
+# ===============================================================================
 # Copyright (C) 2010 Diego Duclos
 #
 # This file is part of eos.
@@ -15,7 +15,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with eos.  If not, see <http://www.gnu.org/licenses/>.
-#===============================================================================
+# ===============================================================================
 
 from sqlalchemy import Column, String, Integer, Table
 from sqlalchemy.orm import mapper, synonym, deferred
@@ -24,10 +24,10 @@ from eos.db import gamedata_meta
 from eos.types import Icon
 
 icons_table = Table("icons", gamedata_meta,
-                    Column("iconID", Integer, primary_key = True),
+                    Column("iconID", Integer, primary_key=True),
                     Column("description", String),
                     Column("iconFile", String))
 
 mapper(Icon, icons_table,
-       properties = {"ID" : synonym("iconID"),
-                     "description" : deferred(icons_table.c.description)})
+       properties={"ID": synonym("iconID"),
+                   "description": deferred(icons_table.c.description)})

eos/db/gamedata/item.py

@@ -1,4 +1,4 @@
-#===============================================================================
+# ===============================================================================
 # Copyright (C) 2010 Diego Duclos
 #
 # This file is part of eos.
@@ -15,18 +15,18 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with eos.  If not, see <http://www.gnu.org/licenses/>.
-#===============================================================================
+# ===============================================================================
 
 from sqlalchemy import Column, String, Integer, Boolean, ForeignKey, Table, Float
-from sqlalchemy.orm import relation, mapper, synonym, deferred
 from sqlalchemy.ext.associationproxy import association_proxy
+from sqlalchemy.orm import relation, mapper, synonym, deferred
 from sqlalchemy.orm.collections import attribute_mapped_collection
 
 from eos.db import gamedata_meta
 from eos.types import Icon, Attribute, Item, Effect, MetaType, Group, Traits
 
 items_table = Table("invtypes", gamedata_meta,
-                    Column("typeID", Integer, primary_key = True),
+                    Column("typeID", Integer, primary_key=True),
                     Column("typeName", String, index=True),
                     Column("description", String),
                     Column("raceID", Integer),
@@ -39,23 +39,23 @@ items_table = Table("invtypes", gamedata_meta,
                     Column("iconID", Integer, ForeignKey("icons.iconID")),
                     Column("groupID", Integer, ForeignKey("invgroups.groupID"), index=True))
 
-from .metaGroup import metatypes_table
-from .traits import traits_table
+from .metaGroup import metatypes_table # noqa
+from .traits import traits_table # noqa
 
 mapper(Item, items_table,
-       properties = {"group" : relation(Group, backref = "items"),
-                     "icon" : relation(Icon),
-                     "_Item__attributes" : relation(Attribute, collection_class = attribute_mapped_collection('name')),
-                     "effects" : relation(Effect, collection_class = attribute_mapped_collection('name')),
-                     "metaGroup" : relation(MetaType,
-                                            primaryjoin = metatypes_table.c.typeID == items_table.c.typeID,
-                                            uselist = False),
-                     "ID" : synonym("typeID"),
-                     "name" : synonym("typeName"),
-                     "description" : deferred(items_table.c.description),
-                     "traits" : relation(Traits,
-                                         primaryjoin = traits_table.c.typeID == items_table.c.typeID,
-                                         uselist = False)
-                    })
+       properties={"group": relation(Group, backref="items"),
+                   "icon": relation(Icon),
+                   "_Item__attributes": relation(Attribute, collection_class=attribute_mapped_collection('name')),
+                   "effects": relation(Effect, collection_class=attribute_mapped_collection('name')),
+                   "metaGroup": relation(MetaType,
+                                         primaryjoin=metatypes_table.c.typeID == items_table.c.typeID,
+                                         uselist=False),
+                   "ID": synonym("typeID"),
+                   "name": synonym("typeName"),
+                   "description": deferred(items_table.c.description),
+                   "traits": relation(Traits,
+                                      primaryjoin=traits_table.c.typeID == items_table.c.typeID,
+                                      uselist=False)
+                   })
 
 Item.category = association_proxy("group", "category")

eos/db/gamedata/marketGroup.py

@@ -1,4 +1,4 @@
-#===============================================================================
+# ===============================================================================
 # Copyright (C) 2010 Diego Duclos
 #
 # This file is part of eos.
@@ -15,7 +15,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with eos.  If not, see <http://www.gnu.org/licenses/>.
-#===============================================================================
+# ===============================================================================
 
 from sqlalchemy import Column, String, Integer, Boolean, ForeignKey, Table
 from sqlalchemy.orm import relation, mapper, synonym, deferred
@@ -24,17 +24,19 @@ from eos.db import gamedata_meta
 from eos.types import Item, MarketGroup, Icon
 
 marketgroups_table = Table("invmarketgroups", gamedata_meta,
-                           Column("marketGroupID", Integer, primary_key = True),
+                           Column("marketGroupID", Integer, primary_key=True),
                            Column("marketGroupName", String),
                            Column("description", String),
                            Column("hasTypes", Boolean),
-                           Column("parentGroupID", Integer, ForeignKey("invmarketgroups.marketGroupID", initially="DEFERRED", deferrable=True)),
+                           Column("parentGroupID", Integer,
+                                  ForeignKey("invmarketgroups.marketGroupID", initially="DEFERRED", deferrable=True)),
                            Column("iconID", Integer, ForeignKey("icons.iconID")))
 
 mapper(MarketGroup, marketgroups_table,
-       properties = {"items" : relation(Item, backref = "marketGroup"),
-                     "parent" : relation(MarketGroup, backref = "children", remote_side = [marketgroups_table.c.marketGroupID]),
-                     "icon" : relation(Icon),
-                     "ID" : synonym("marketGroupID"),
-                     "name" : synonym("marketGroupName"),
-                     "description" : deferred(marketgroups_table.c.description)})
+       properties={"items": relation(Item, backref="marketGroup"),
+                   "parent": relation(MarketGroup, backref="children",
+                                      remote_side=[marketgroups_table.c.marketGroupID]),
+                   "icon": relation(Icon),
+                   "ID": synonym("marketGroupID"),
+                   "name": synonym("marketGroupName"),
+                   "description": deferred(marketgroups_table.c.description)})

eos/db/gamedata/metaData.py

@@ -1,4 +1,4 @@
-#===============================================================================
+# ===============================================================================
 # Copyright (C) 2010 Diego Duclos
 #
 # This file is part of eos.
@@ -15,15 +15,16 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with eos.  If not, see <http://www.gnu.org/licenses/>.
-#===============================================================================
+# ===============================================================================
 
 from sqlalchemy import Column, Table, String
 from sqlalchemy.orm import mapper
-from eos.types import MetaData
+
 from eos.db import gamedata_meta
+from eos.types import MetaData
 
 metadata_table = Table("metadata", gamedata_meta,
-                           Column("field_name", String, primary_key=True),
-                           Column("field_value", String))
+                       Column("field_name", String, primary_key=True),
+                       Column("field_value", String))
 
 mapper(MetaData, metadata_table)

eos/db/gamedata/metaGroup.py

@@ -1,4 +1,4 @@
-#===============================================================================
+# ===============================================================================
 # Copyright (C) 2010 Diego Duclos
 #
 # This file is part of eos.
@@ -15,33 +15,33 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with eos.  If not, see <http://www.gnu.org/licenses/>.
-#===============================================================================
+# ===============================================================================
 
 from sqlalchemy import Table, Column, Integer, ForeignKey, String
+from sqlalchemy.ext.associationproxy import association_proxy
 from sqlalchemy.orm import relation, mapper, synonym
+
 from eos.db import gamedata_meta
 from eos.db.gamedata.item import items_table
 from eos.types import MetaGroup, Item, MetaType
-from sqlalchemy.ext.associationproxy import association_proxy
 
 metagroups_table = Table("invmetagroups", gamedata_meta,
-                         Column("metaGroupID", Integer, primary_key = True),
+                         Column("metaGroupID", Integer, primary_key=True),
                          Column("metaGroupName", String))
 
 metatypes_table = Table("invmetatypes", gamedata_meta,
-                        Column("typeID", Integer, ForeignKey("invtypes.typeID"), primary_key = True),
+                        Column("typeID", Integer, ForeignKey("invtypes.typeID"), primary_key=True),
                         Column("parentTypeID", Integer, ForeignKey("invtypes.typeID")),
                         Column("metaGroupID", Integer, ForeignKey("invmetagroups.metaGroupID")))
 
 mapper(MetaGroup, metagroups_table,
-       properties = {"ID" : synonym("metaGroupID"),
-                     "name" : synonym("metaGroupName")})
+       properties={"ID": synonym("metaGroupID"),
+                   "name": synonym("metaGroupName")})
 
 mapper(MetaType, metatypes_table,
-       properties = {"ID" : synonym("metaGroupID"),
-                     "parent" : relation(Item, primaryjoin = metatypes_table.c.parentTypeID == items_table.c.typeID),
-                     "items" : relation(Item, primaryjoin = metatypes_table.c.typeID == items_table.c.typeID),
-                     "info": relation(MetaGroup, lazy=False)})
+       properties={"ID": synonym("metaGroupID"),
+                   "parent": relation(Item, primaryjoin=metatypes_table.c.parentTypeID == items_table.c.typeID),
+                   "items": relation(Item, primaryjoin=metatypes_table.c.typeID == items_table.c.typeID),
+                   "info": relation(MetaGroup, lazy=False)})
 
 MetaType.name = association_proxy("info", "name")
-

eos/db/gamedata/queries.py

@@ -1,4 +1,4 @@
-#===============================================================================
+# ===============================================================================
 # Copyright (C) 2010 Diego Duclos
 #
 # This file is part of eos.
@@ -15,21 +15,26 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with eos.  If not, see <http://www.gnu.org/licenses/>.
-#===============================================================================
+# ===============================================================================
 
+from sqlalchemy.orm import join, exc
+from sqlalchemy.sql import and_, or_, select
+
+import eos.config
+# TODO: Unsure which item the code below needs :(
+# from eos.gamedata import Item
+from eos.gamedata import Attribute
 from eos.db import gamedata_session
 from eos.db.gamedata.metaGroup import metatypes_table, items_table
-from sqlalchemy.sql import and_, or_, select, func
-from sqlalchemy.orm import join, exc
-from eos.types import Item, Category, Group, MarketGroup, AttributeInfo, MetaData, MetaGroup
 from eos.db.util import processEager, processWhere
-import eos.config
+from eos.types import Item, Category, Group, MarketGroup, AttributeInfo, MetaData, MetaGroup, AlphaClone
 
 configVal = getattr(eos.config, "gamedataCache", None)
 if configVal is True:
     def cachedQuery(amount, *keywords):
         def deco(function):
             cache = {}
+
             def checkAndReturn(*args, **kwargs):
                 useCache = kwargs.pop("useCache", True)
                 cacheKey = []
@@ -45,6 +50,7 @@ if configVal is True:
                 return handler
 
             return checkAndReturn
+
         return deco
 
 elif callable(configVal):
@@ -56,8 +62,10 @@ else:
                 return function(*args, **kwargs)
 
             return checkAndReturn
+
         return deco
 
+
 def sqlizeString(line):
     # Escape backslashes first, as they will be as escape symbol in queries
     # Then escape percent and underscore signs
@@ -65,7 +73,10 @@ def sqlizeString(line):
     line = line.replace("\\", "\\\\").replace("%", "\\%").replace("_", "\\_").replace("*", "%")
     return line
 
+
 itemNameMap = {}
+
+
 @cachedQuery(1, "lookfor")
 def getItem(lookfor, eager=None):
     if isinstance(lookfor, int):
@@ -88,7 +99,28 @@ def getItem(lookfor, eager=None):
         raise TypeError("Need integer or string as argument")
     return item
 
+
+@cachedQuery(1, "lookfor")
+def getAlphaClone(lookfor, eager=None):
+    if isinstance(lookfor, int):
+        if eager is None:
+            item = gamedata_session.query(AlphaClone).get(lookfor)
+        else:
+            item = gamedata_session.query(AlphaClone).options(*processEager(eager)).filter(AlphaClone.ID == lookfor).first()
+    else:
+        raise TypeError("Need integer as argument")
+    return item
+
+
+def getAlphaCloneList(eager=None):
+    eager = processEager(eager)
+    clones = gamedata_session.query(AlphaClone).options(*eager).all()
+    return clones
+
+
 groupNameMap = {}
+
+
 @cachedQuery(1, "lookfor")
 def getGroup(lookfor, eager=None):
     if isinstance(lookfor, int):
@@ -111,63 +143,78 @@ def getGroup(lookfor, eager=None):
         raise TypeError("Need integer or string as argument")
     return group
 
+
 categoryNameMap = {}
+
+
 @cachedQuery(1, "lookfor")
 def getCategory(lookfor, eager=None):
     if isinstance(lookfor, int):
         if eager is None:
             category = gamedata_session.query(Category).get(lookfor)
         else:
-            category = gamedata_session.query(Category).options(*processEager(eager)).filter(Category.ID == lookfor).first()
+            category = gamedata_session.query(Category).options(*processEager(eager)).filter(
+                Category.ID == lookfor).first()
     elif isinstance(lookfor, basestring):
         if lookfor in categoryNameMap:
             id = categoryNameMap[lookfor]
             if eager is None:
                 category = gamedata_session.query(Category).get(id)
             else:
-                category = gamedata_session.query(Category).options(*processEager(eager)).filter(Category.ID == id).first()
+                category = gamedata_session.query(Category).options(*processEager(eager)).filter(
+                    Category.ID == id).first()
         else:
             # Category names are unique, so we can use first() instead of one()
-            category = gamedata_session.query(Category).options(*processEager(eager)).filter(Category.name == lookfor).first()
+            category = gamedata_session.query(Category).options(*processEager(eager)).filter(
+                Category.name == lookfor).first()
             categoryNameMap[lookfor] = category.ID
     else:
         raise TypeError("Need integer or string as argument")
     return category
 
+
 metaGroupNameMap = {}
+
+
 @cachedQuery(1, "lookfor")
 def getMetaGroup(lookfor, eager=None):
     if isinstance(lookfor, int):
         if eager is None:
             metaGroup = gamedata_session.query(MetaGroup).get(lookfor)
         else:
-            metaGroup = gamedata_session.query(MetaGroup).options(*processEager(eager)).filter(MetaGroup.ID == lookfor).first()
+            metaGroup = gamedata_session.query(MetaGroup).options(*processEager(eager)).filter(
+                MetaGroup.ID == lookfor).first()
     elif isinstance(lookfor, basestring):
         if lookfor in metaGroupNameMap:
             id = metaGroupNameMap[lookfor]
             if eager is None:
                 metaGroup = gamedata_session.query(MetaGroup).get(id)
             else:
-                metaGroup = gamedata_session.query(MetaGroup).options(*processEager(eager)).filter(MetaGroup.ID == id).first()
+                metaGroup = gamedata_session.query(MetaGroup).options(*processEager(eager)).filter(
+                    MetaGroup.ID == id).first()
         else:
             # MetaGroup names are unique, so we can use first() instead of one()
-            metaGroup = gamedata_session.query(MetaGroup).options(*processEager(eager)).filter(MetaGroup.name == lookfor).first()
+            metaGroup = gamedata_session.query(MetaGroup).options(*processEager(eager)).filter(
+                MetaGroup.name == lookfor).first()
             metaGroupNameMap[lookfor] = metaGroup.ID
     else:
         raise TypeError("Need integer or string as argument")
     return metaGroup
 
+
 @cachedQuery(1, "lookfor")
 def getMarketGroup(lookfor, eager=None):
     if isinstance(lookfor, int):
         if eager is None:
             marketGroup = gamedata_session.query(MarketGroup).get(lookfor)
         else:
-            marketGroup = gamedata_session.query(MarketGroup).options(*processEager(eager)).filter(MarketGroup.ID == lookfor).first()
+            marketGroup = gamedata_session.query(MarketGroup).options(*processEager(eager)).filter(
+                MarketGroup.ID == lookfor).first()
     else:
         raise TypeError("Need integer as argument")
     return marketGroup
 
+
 @cachedQuery(2, "where", "filter")
 def getItemsByCategory(filter, where=None, eager=None):
     if isinstance(filter, int):
@@ -178,7 +225,9 @@ def getItemsByCategory(filter, where=None, eager=None):
         raise TypeError("Need integer or string as argument")
 
     filter = processWhere(filter, where)
-    return gamedata_session.query(Item).options(*processEager(eager)).join(Item.group, Group.category).filter(filter).all()
+    return gamedata_session.query(Item).options(*processEager(eager)).join(Item.group, Group.category).filter(
+        filter).all()
+
 
 @cachedQuery(3, "where", "nameLike", "join")
 def searchItems(nameLike, where=None, join=None, eager=None):
@@ -194,10 +243,14 @@ def searchItems(nameLike, where=None, join=None, eager=None):
     items = gamedata_session.query(Item).options(*processEager(eager)).join(*join)
     for token in nameLike.split(' '):
         token_safe = u"%{0}%".format(sqlizeString(token))
-        items = items.filter(processWhere(Item.name.like(token_safe, escape="\\"), where))
+        if where is not None:
+            items = items.filter(and_(Item.name.like(token_safe, escape="\\"), where))
+        else:
+            items = items.filter(Item.name.like(token_safe, escape="\\"))
     items = items.limit(100).all()
     return items
 
+
 @cachedQuery(2, "where", "itemids")
 def getVariations(itemids, where=None, eager=None):
     for itemid in itemids:
@@ -210,9 +263,11 @@ def getVariations(itemids, where=None, eager=None):
     itemfilter = or_(*(metatypes_table.c.parentTypeID == itemid for itemid in itemids))
     filter = processWhere(itemfilter, where)
     joinon = items_table.c.typeID == metatypes_table.c.typeID
-    vars = gamedata_session.query(Item).options(*processEager(eager)).join((metatypes_table, joinon)).filter(filter).all()
+    vars = gamedata_session.query(Item).options(*processEager(eager)).join((metatypes_table, joinon)).filter(
+        filter).all()
     return vars
 
+
 @cachedQuery(1, "attr")
 def getAttributeInfo(attr, eager=None):
     if isinstance(attr, basestring):
@@ -227,6 +282,7 @@ def getAttributeInfo(attr, eager=None):
         result = None
     return result
 
+
 @cachedQuery(1, "field")
 def getMetaData(field):
     if isinstance(field, basestring):
@@ -235,6 +291,7 @@ def getMetaData(field):
         raise TypeError("Need string as argument")
     return data
 
+
 @cachedQuery(2, "itemIDs", "attributeID")
 def directAttributeRequest(itemIDs, attrIDs):
     for itemID in itemIDs:
@@ -244,9 +301,9 @@ def directAttributeRequest(itemIDs, attrIDs):
         if not isinstance(itemID, int):
             raise TypeError("All itemIDs must be integer")
 
-    q = select((eos.types.Item.typeID, eos.types.Attribute.attributeID, eos.types.Attribute.value),
-                                  and_(eos.types.Attribute.attributeID.in_(attrIDs), eos.types.Item.typeID.in_(itemIDs)),
-                                  from_obj=[join(eos.types.Attribute, eos.types.Item)])
+    q = select((Item.typeID, Attribute.attributeID, Attribute.value),
+               and_(Attribute.attributeID.in_(attrIDs), Item.typeID.in_(itemIDs)),
+               from_obj=[join(Attribute, Item)])
 
     result = gamedata_session.execute(q).fetchall()
     return result

eos/db/gamedata/traits.py

@@ -1,11 +1,11 @@
-
 from sqlalchemy import Column, Table, Integer, String, ForeignKey
 from sqlalchemy.orm import mapper
-from eos.types import Traits
+
 from eos.db import gamedata_meta
+from eos.types import Traits
 
 traits_table = Table("invtraits", gamedata_meta,
                      Column("typeID", Integer, ForeignKey("invtypes.typeID"), primary_key=True),
                      Column("traitText", String))
 
-mapper(Traits, traits_table);
+mapper(Traits, traits_table)

eos/db/gamedata/unit.py

@@ -1,4 +1,4 @@
-#===============================================================================
+# ===============================================================================
 # Copyright (C) 2010 Diego Duclos
 #
 # This file is part of eos.
@@ -15,7 +15,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with eos.  If not, see <http://www.gnu.org/licenses/>.
-#===============================================================================
+# ===============================================================================
 
 from sqlalchemy import Column, Table, Integer, String
 from sqlalchemy.orm import mapper, synonym
@@ -24,10 +24,10 @@ from eos.db import gamedata_meta
 from eos.types import Unit
 
 groups_table = Table("dgmunits", gamedata_meta,
-                     Column("unitID", Integer, primary_key = True),
+                     Column("unitID", Integer, primary_key=True),
                      Column("unitName", String),
                      Column("displayName", String))
 
 mapper(Unit, groups_table,
-       properties = {"ID" : synonym("unitID"),
-                     "name" : synonym("unitName")})
+       properties={"ID": synonym("unitID"),
+                   "name": synonym("unitName")})

eos/db/migration.py

@@ -1,20 +1,22 @@
-import config
+import logging
 import shutil
 import time
-import re
-import os
+
+import config
 import migrations
-import logging
 
 logger = logging.getLogger(__name__)
 
+
 def getVersion(db):
     cursor = db.execute('PRAGMA user_version')
     return cursor.fetchone()[0]
 
+
 def getAppVersion():
     return migrations.appVersion
 
+
 def update(saveddata_engine):
     dbVersion = getVersion(saveddata_engine)
     appVersion = getAppVersion()
@@ -24,7 +26,7 @@ def update(saveddata_engine):
 
     if dbVersion < appVersion:
         # Automatically backup database
-        toFile = "%s/saveddata_migration_%d-%d_%s.db"%(
+        toFile = "%s/saveddata_migration_%d-%d_%s.db" % (
             config.savePath,
             dbVersion,
             appVersion,
@@ -33,9 +35,9 @@ def update(saveddata_engine):
         shutil.copyfile(config.saveDB, toFile)
 
         for version in xrange(dbVersion, appVersion):
-            func = migrations.updates[version+1]
+            func = migrations.updates[version + 1]
             if func:
-                logger.info("Applying database update: %d", version+1)
+                logger.info("Applying database update: %d", version + 1)
                 func(saveddata_engine)
 
         # when all is said and done, set version to current

eos/db/migrations/__init__.py

@@ -11,7 +11,6 @@ upgrade files 1-5)
 import pkgutil
 import re
 
-
 updates = {}
 appVersion = 0
 

eos/db/migrations/upgrade1.py

@@ -45,7 +45,7 @@ CONVERSIONS = {
         8746,  # Quantum Co-Processor
         8745,  # Photonic CPU Enhancer
         15425,  # Naiyon's Modified Co-Processor (never existed but convert
-                # anyway as some fits may include it)
+        # anyway as some fits may include it)
     ],
     8748: [  # Upgraded Co-Processor
         8747,  # Nanomechanical CPU Enhancer I
@@ -70,7 +70,7 @@ CONVERSIONS = {
         16543,  # Micro 'Vigor' Core Augmentation
     ],
     8089: [  # Compact Light Missile Launcher
-       8093,  # Prototype 'Arbalest' Light Missile Launcher
+        8093,  # Prototype 'Arbalest' Light Missile Launcher
     ],
     8091: [  # Ample Light Missile Launcher
         7993,  # Experimental TE-2100 Light Missile Launcher
@@ -82,6 +82,7 @@ CONVERSIONS = {
     ]
 }
 
+
 def upgrade(saveddata_engine):
     # Update fits schema to include target resists attribute
     try:
@@ -92,6 +93,7 @@ def upgrade(saveddata_engine):
     # Convert modules
     for replacement_item, list in CONVERSIONS.iteritems():
         for retired_item in list:
-            saveddata_engine.execute('UPDATE "modules" SET "itemID" = ? WHERE "itemID" = ?', (replacement_item, retired_item))
-            saveddata_engine.execute('UPDATE "cargo" SET "itemID" = ? WHERE "itemID" = ?', (replacement_item, retired_item))
-
+            saveddata_engine.execute('UPDATE "modules" SET "itemID" = ? WHERE "itemID" = ?',
+                                     (replacement_item, retired_item))
+            saveddata_engine.execute('UPDATE "cargo" SET "itemID" = ? WHERE "itemID" = ?',
+                                     (replacement_item, retired_item))

eos/db/migrations/upgrade10.py

@@ -6,6 +6,7 @@ Migration 10
 
 import sqlalchemy
 
+
 def upgrade(saveddata_engine):
     # Update projectedFits schema to include active attribute
     try:

eos/db/migrations/upgrade11.py

@@ -7,7 +7,6 @@ Migration 11
     modules with their new replacements
 """
 
-
 CONVERSIONS = {
     16467: (  # Medium Gremlin Compact Energy Neutralizer
         16471,  # Medium Unstable Power Fluctuator I
@@ -106,11 +105,12 @@ CONVERSIONS = {
     ),
 }
 
-def upgrade(saveddata_engine):
 
+def upgrade(saveddata_engine):
     # Convert modules
     for replacement_item, list in CONVERSIONS.iteritems():
         for retired_item in list:
-            saveddata_engine.execute('UPDATE "modules" SET "itemID" = ? WHERE "itemID" = ?', (replacement_item, retired_item))
-            saveddata_engine.execute('UPDATE "cargo" SET "itemID" = ? WHERE "itemID" = ?', (replacement_item, retired_item))
-
+            saveddata_engine.execute('UPDATE "modules" SET "itemID" = ? WHERE "itemID" = ?',
+                                     (replacement_item, retired_item))
+            saveddata_engine.execute('UPDATE "cargo" SET "itemID" = ? WHERE "itemID" = ?',
+                                     (replacement_item, retired_item))

eos/db/migrations/upgrade12.py

@@ -7,7 +7,6 @@ Migration 12
     modules with their new replacements
 """
 
-
 CONVERSIONS = {
     16457: (  # Crosslink Compact Ballistic Control System
         16459,  # Muon Coil Bolt Array I
@@ -330,11 +329,12 @@ CONVERSIONS = {
     ),
 }
 
-def upgrade(saveddata_engine):
 
+def upgrade(saveddata_engine):
     # Convert modules
     for replacement_item, list in CONVERSIONS.iteritems():
         for retired_item in list:
-            saveddata_engine.execute('UPDATE "modules" SET "itemID" = ? WHERE "itemID" = ?', (replacement_item, retired_item))
-            saveddata_engine.execute('UPDATE "cargo" SET "itemID" = ? WHERE "itemID" = ?', (replacement_item, retired_item))
-
+            saveddata_engine.execute('UPDATE "modules" SET "itemID" = ? WHERE "itemID" = ?',
+                                     (replacement_item, retired_item))
+            saveddata_engine.execute('UPDATE "cargo" SET "itemID" = ? WHERE "itemID" = ?',
+                                     (replacement_item, retired_item))

eos/db/migrations/upgrade13.py

@@ -6,10 +6,11 @@ Migration 13
 
 import sqlalchemy
 
+
 def upgrade(saveddata_engine):
     # Update fits schema to include implant location attribute
     try:
         saveddata_engine.execute("SELECT implantLocation FROM fits LIMIT 1")
     except sqlalchemy.exc.DatabaseError:
         saveddata_engine.execute("ALTER TABLE fits ADD COLUMN implantLocation INTEGER;")
-        saveddata_engine.execute("UPDATE fits SET implantLocation = 0")
+        saveddata_engine.execute("UPDATE fits SET implantLocation = 0")

eos/db/migrations/upgrade14.py

@@ -0,0 +1,21 @@
+"""
+Migration 14
+
+- This should take care of issue #586.
+"""
+
+import sqlalchemy
+
+
+def upgrade(saveddata_engine):
+    if saveddata_engine.execute(
+            "SELECT name FROM sqlite_master WHERE type='table' AND name='fighters'").scalar() == 'fighters':
+        # Fighters table exists
+        try:
+            saveddata_engine.execute("SELECT active FROM fighters LIMIT 1")
+        except sqlalchemy.exc.DatabaseError:
+            # if we don't have the active column, we are on an old pre-release version. Drop the tables and move on
+            # (they will be recreated)
+
+            saveddata_engine.execute("DROP TABLE fighters")
+            saveddata_engine.execute("DROP TABLE fightersAbilities")

eos/db/migrations/upgrade15.py

@@ -0,0 +1,21 @@
+"""
+Migration 15
+
+- Delete projected modules on citadels
+"""
+
+import sqlalchemy
+
+
+def upgrade(saveddata_engine):
+    sql = """
+    DELETE FROM modules WHERE ID IN
+    (
+        SELECT m.ID FROM modules AS m
+        JOIN fits AS f ON m.fitID = f.ID
+        WHERE f.shipID IN ("35832", "35833", "35834", "40340")
+        AND m.projected = 1
+    )
+    """
+
+    saveddata_engine.execute(sql)

eos/db/migrations/upgrade16.py

@@ -0,0 +1,15 @@
+"""
+Migration 16
+
+- Alters fits table to introduce notes attribute
+"""
+
+import sqlalchemy
+
+
+def upgrade(saveddata_engine):
+    # Update fits schema to include notes attribute
+    try:
+        saveddata_engine.execute("SELECT notes FROM fits LIMIT 1")
+    except sqlalchemy.exc.DatabaseError:
+        saveddata_engine.execute("ALTER TABLE fits ADD COLUMN notes VARCHAR;")

eos/db/migrations/upgrade17.py

@@ -0,0 +1,40 @@
+"""
+Migration 17
+
+- Moves all fleet boosters to the new schema
+"""
+
+import sqlalchemy
+
+
+def upgrade(saveddata_engine):
+    from eos.db import saveddata_session
+    from eos.db.saveddata.fit import commandFits_table
+
+    sql = """
+          SELECT sm.memberID as boostedFit, s.leaderID AS squadBoost, w.leaderID AS wingBoost, g.leaderID AS gangBoost
+          FROM squadmembers sm
+          JOIN squads s ON s.ID = sm.squadID
+          JOIN wings w on w.ID = s.wingID
+          JOIN gangs g on g.ID = w.gangID
+          """
+
+    results = saveddata_session.execute(sql)
+
+    inserts = []
+
+    for row in results:
+        boosted = row["boostedFit"]
+        types = ("squad", "wing", "gang")
+        for x in types:
+            value = row["{}Boost".format(x)]
+            if value is None:
+                continue
+
+            inserts.append({"boosterID": value, "boostedID": boosted, "active": 1})
+            try:
+                saveddata_session.execute(commandFits_table.insert(),
+                                          {"boosterID": value, "boostedID": boosted, "active": 1})
+            except Exception:
+                pass
+    saveddata_session.commit()

eos/db/migrations/upgrade18.py

@@ -0,0 +1,68 @@
+"""
+Migration 8
+
+- Converts modules from old Warfare Links to Command Modules
+"""
+
+CONVERSIONS = {
+    42526: (  # Armor Command Burst I
+        20069,  # Armored Warfare Link - Damage Control I
+        20409,  # Armored Warfare Link - Passive Defense I
+        22227,  # Armored Warfare Link - Rapid Repair I
+    ),
+    43552: (  # Armor Command Burst II
+        4264,  # Armored Warfare Link - Damage Control II
+        4266,  # Armored Warfare Link - Passive Defense II
+        4266,  # Armored Warfare Link - Rapid Repair II
+    ),
+    42527: (  # Information Command Burst I
+        11052,  # Information Warfare Link - Sensor Integrity I
+        20405,  # Information Warfare Link - Recon Operation I
+        20406,  # Information Warfare Link - Electronic Superiority I
+    ),
+    43554: (  # Information Command Burst II
+        4268,  # Information Warfare Link - Electronic Superiority II
+        4270,  # Information Warfare Link - Recon Operation II
+        4272,  # Information Warfare Link - Sensor Integrity II
+    ),
+    42529: (  # Shield Command Burst I
+        20124,  # Siege Warfare Link - Active Shielding I
+        20514,  # Siege Warfare Link - Shield Harmonizing I
+        22228,  # Siege Warfare Link - Shield Efficiency I
+    ),
+    43555: (  # Shield Command Burst II
+        4280,  # Siege Warfare Link - Active Shielding II
+        4282,  # Siege Warfare Link - Shield Efficiency II
+        4284  # Siege Warfare Link - Shield Harmonizing II
+    ),
+    42530: (  # Skirmish Command Burst I
+        11017,  # Skirmish Warfare Link - Interdiction Maneuvers I
+        20070,  # Skirmish Warfare Link - Evasive Maneuvers I
+        20408,  # Skirmish Warfare Link - Rapid Deployment I
+    ),
+    43556: (  # Skirmish Command Burst II
+        4286,  # Skirmish Warfare Link - Evasive Maneuvers II
+        4288,  # Skirmish Warfare Link - Interdiction Maneuvers II
+        4290  # Skirmish Warfare Link - Rapid Deployment II
+    ),
+    42528: (  # Mining Foreman Burst I
+        22553,  # Mining Foreman Link - Harvester Capacitor Efficiency I
+        22555,  # Mining Foreman Link - Mining Laser Field Enhancement I
+        22557,  # Mining Foreman Link - Laser Optimization I
+    ),
+    43551: (  # Mining Foreman Burst II
+        4274,  # Mining Foreman Link - Harvester Capacitor Efficiency II
+        4276,  # Mining Foreman Link - Laser Optimization II
+        4278  # Mining Foreman Link - Mining Laser Field Enhancement II
+    ),
+}
+
+
+def upgrade(saveddata_engine):
+    # Convert modules
+    for replacement_item, list in CONVERSIONS.iteritems():
+        for retired_item in list:
+            saveddata_engine.execute('UPDATE "modules" SET "itemID" = ? WHERE "itemID" = ?',
+                                     (replacement_item, retired_item))
+            saveddata_engine.execute('UPDATE "cargo" SET "itemID" = ? WHERE "itemID" = ?',
+                                     (replacement_item, retired_item))

eos/db/migrations/upgrade19.py

@@ -0,0 +1,20 @@
+"""
+Migration 19
+
+- Deletes broken references to fits from the commandFits table (see GH issue #844)
+"""
+
+import sqlalchemy
+
+
+def upgrade(saveddata_engine):
+    from eos.db import saveddata_session
+
+    sql = """
+        DELETE FROM commandFits
+        WHERE boosterID NOT IN (select ID from fits)
+        OR boostedID NOT IN (select ID from fits)
+        """
+
+    saveddata_session.execute(sql)
+    saveddata_session.commit()

eos/db/migrations/upgrade2.py

@@ -6,6 +6,7 @@ Migration 2
 
 import sqlalchemy
 
+
 def upgrade(saveddata_engine):
     # Update characters schema to include default chars
     try:

eos/db/migrations/upgrade20.py

@@ -0,0 +1,15 @@
+"""
+Migration 20
+
+- Adds support for alpha clones to the characters table
+"""
+
+import sqlalchemy
+
+
+def upgrade(saveddata_engine):
+    # Update characters schema to include alphaCloneID
+    try:
+        saveddata_engine.execute("SELECT alphaCloneID FROM characters LIMIT 1")
+    except sqlalchemy.exc.DatabaseError:
+        saveddata_engine.execute("ALTER TABLE characters ADD COLUMN alphaCloneID INTEGER;")

eos/db/migrations/upgrade3.py

@@ -6,6 +6,7 @@ Migration 3
 
 import sqlalchemy
 
+
 def upgrade(saveddata_engine):
     try:
         saveddata_engine.execute("SELECT modeID FROM fits LIMIT 1")

eos/db/migrations/upgrade4.py

@@ -10,7 +10,6 @@ Migration 4
     and output of itemDiff.py
 """
 
-
 CONVERSIONS = {
     506: (  # 'Basic' Capacitor Power Relay
         8205,  # Alpha Reactor Control: Capacitor Power Relay
@@ -131,11 +130,12 @@ CONVERSIONS = {
     ),
 }
 
-def upgrade(saveddata_engine):
 
+def upgrade(saveddata_engine):
     # Convert modules
     for replacement_item, list in CONVERSIONS.iteritems():
         for retired_item in list:
-            saveddata_engine.execute('UPDATE "modules" SET "itemID" = ? WHERE "itemID" = ?', (replacement_item, retired_item))
-            saveddata_engine.execute('UPDATE "cargo" SET "itemID" = ? WHERE "itemID" = ?', (replacement_item, retired_item))
-
+            saveddata_engine.execute('UPDATE "modules" SET "itemID" = ? WHERE "itemID" = ?',
+                                     (replacement_item, retired_item))
+            saveddata_engine.execute('UPDATE "cargo" SET "itemID" = ? WHERE "itemID" = ?',
+                                     (replacement_item, retired_item))

eos/db/migrations/upgrade5.py

@@ -4,5 +4,6 @@ Migration 5
 Simply deletes damage profiles with a blank name. See GH issue #256
 """
 
+
 def upgrade(saveddata_engine):
     saveddata_engine.execute('DELETE FROM damagePatterns WHERE name LIKE ?', ("",))

eos/db/migrations/upgrade6.py

@@ -4,6 +4,8 @@ Migration 6
 Overwrites damage profile 0 to reset bad uniform values (bad values set with bug)
 """
 
+
 def upgrade(saveddata_engine):
     saveddata_engine.execute('DELETE FROM damagePatterns WHERE name LIKE ? OR ID LIKE ?', ("Uniform", "1"))
-    saveddata_engine.execute('INSERT INTO damagePatterns VALUES (?, ?, ?, ?, ?, ?, ?)', (1, "Uniform", 25, 25, 25, 25, None))
+    saveddata_engine.execute('INSERT INTO damagePatterns VALUES (?, ?, ?, ?, ?, ?, ?)',
+                             (1, "Uniform", 25, 25, 25, 25, None))

eos/db/migrations/upgrade7.py

@@ -8,17 +8,16 @@ Migration 7
     Pyfa.
 """
 
-
 CONVERSIONS = {
     640: (  # Scorpion
         4005,  # Scorpion Ishukone Watch
     )
 }
 
-def upgrade(saveddata_engine):
 
+def upgrade(saveddata_engine):
     # Convert ships
     for replacement_item, list in CONVERSIONS.iteritems():
         for retired_item in list:
-            saveddata_engine.execute('UPDATE "fits" SET "shipID" = ? WHERE "shipID" = ?', (replacement_item, retired_item))
-
+            saveddata_engine.execute('UPDATE "fits" SET "shipID" = ? WHERE "shipID" = ?',
+                                     (replacement_item, retired_item))

eos/db/migrations/upgrade8.py

@@ -7,7 +7,6 @@ Migration 8
     modules with their new replacements
 """
 
-
 CONVERSIONS = {
     8529: (  # Large F-S9 Regolith Compact Shield Extender
         8409,  # Large Subordinate Screen Stabilizer I
@@ -71,15 +70,16 @@ CONVERSIONS = {
         11321,  # 800mm Reinforced Nanofiber Plates I
     ),
     11317: (  # 800mm Rolled Tungsten Compact Plates
-        11315,  #  800mm Reinforced Titanium Plates I
+        11315,  # 800mm Reinforced Titanium Plates I
     ),
 }
 
-def upgrade(saveddata_engine):
 
+def upgrade(saveddata_engine):
     # Convert modules
     for replacement_item, list in CONVERSIONS.iteritems():
         for retired_item in list:
-            saveddata_engine.execute('UPDATE "modules" SET "itemID" = ? WHERE "itemID" = ?', (replacement_item, retired_item))
-            saveddata_engine.execute('UPDATE "cargo" SET "itemID" = ? WHERE "itemID" = ?', (replacement_item, retired_item))
-
+            saveddata_engine.execute('UPDATE "modules" SET "itemID" = ? WHERE "itemID" = ?',
+                                     (replacement_item, retired_item))
+            saveddata_engine.execute('UPDATE "cargo" SET "itemID" = ? WHERE "itemID" = ?',
+                                     (replacement_item, retired_item))

eos/db/migrations/upgrade9.py

@@ -16,8 +16,10 @@ CREATE TABLE boostersTemp (
 )
 """
 
+
 def upgrade(saveddata_engine):
     saveddata_engine.execute(tmpTable)
-    saveddata_engine.execute("INSERT INTO boostersTemp (ID, itemID, fitID, active) SELECT ID, itemID, fitID, active FROM boosters")
+    saveddata_engine.execute(
+        "INSERT INTO boostersTemp (ID, itemID, fitID, active) SELECT ID, itemID, fitID, active FROM boosters")
     saveddata_engine.execute("DROP TABLE boosters")
     saveddata_engine.execute("ALTER TABLE boostersTemp RENAME TO boosters")

eos/db/saveddata/__init__.py

@@ -8,11 +8,11 @@ __all__ = [
     "booster",
     "drone",
     "implant",
-    "fleet",
     "damagePattern",
     "miscData",
     "targetResists",
     "override",
-    "crest"
+    "crest",
+    "implantSet",
+    "loadDefaultDatabaseValues"
 ]
-

eos/db/saveddata/booster.py

@@ -1,4 +1,4 @@
-#===============================================================================
+# ===============================================================================
 # Copyright (C) 2010 Diego Duclos
 #
 # This file is part of eos.
@@ -15,25 +15,27 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with eos.  If not, see <http://www.gnu.org/licenses/>.
-#===============================================================================
+# ===============================================================================
 
-from sqlalchemy import Table, Column, ForeignKey, Integer, UniqueConstraint, Boolean
-from sqlalchemy.orm import mapper, relation
+from sqlalchemy import Table, Column, ForeignKey, Integer, Boolean
 from sqlalchemy.ext.associationproxy import association_proxy
+from sqlalchemy.orm import mapper, relation
 
 from eos.db import saveddata_meta
 from eos.types import Booster
 
 boosters_table = Table("boosters", saveddata_meta,
-                       Column("ID", Integer, primary_key = True),
+                       Column("ID", Integer, primary_key=True),
                        Column("itemID", Integer),
-                       Column("fitID", Integer, ForeignKey("fits.ID"), nullable = False),
+                       Column("fitID", Integer, ForeignKey("fits.ID"), nullable=False),
                        Column("active", Boolean),
                        )
 
+# Legacy booster side effect code, should disable but a mapper relies on it.
 activeSideEffects_table = Table("boostersActiveSideEffects", saveddata_meta,
-                                Column("boosterID", ForeignKey("boosters.ID"), primary_key = True),
-                                Column("effectID", Integer, primary_key = True))
+                                Column("boosterID", ForeignKey("boosters.ID"), primary_key=True),
+                                Column("effectID", Integer, primary_key=True))
+
 
 class ActiveSideEffectsDummy(object):
     def __init__(self, effectID):
@@ -42,6 +44,6 @@ class ActiveSideEffectsDummy(object):
 
 mapper(ActiveSideEffectsDummy, activeSideEffects_table)
 mapper(Booster, boosters_table,
-       properties = {"_Booster__activeSideEffectDummies" : relation(ActiveSideEffectsDummy)})
+       properties={"_Booster__activeSideEffectDummies": relation(ActiveSideEffectsDummy)})
 
 Booster._Booster__activeSideEffectIDs = association_proxy("_Booster__activeSideEffectDummies", "effectID")

eos/db/saveddata/cargo.py

@@ -1,4 +1,4 @@
-#===============================================================================
+# ===============================================================================
 # Copyright (C) 2010 Diego Duclos
 #
 # This file is part of eos.
@@ -15,18 +15,18 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with eos.  If not, see <http://www.gnu.org/licenses/>.
-#===============================================================================
+# ===============================================================================
 
-from sqlalchemy import Table, Column, Integer, ForeignKey, Boolean
+from sqlalchemy import Table, Column, Integer, ForeignKey
 from sqlalchemy.orm import mapper
 
 from eos.db import saveddata_meta
 from eos.types import Cargo
 
 cargo_table = Table("cargo", saveddata_meta,
-                     Column("ID", Integer, primary_key=True),
-                     Column("fitID", Integer, ForeignKey("fits.ID"), nullable = False, index = True),
-                     Column("itemID", Integer, nullable = False),
-                     Column("amount", Integer, nullable = False))
+                    Column("ID", Integer, primary_key=True),
+                    Column("fitID", Integer, ForeignKey("fits.ID"), nullable=False, index=True),
+                    Column("itemID", Integer, nullable=False),
+                    Column("amount", Integer, nullable=False))
 
-mapper(Cargo, cargo_table)
+mapper(Cargo, cargo_table)

eos/db/saveddata/character.py

@@ -1,4 +1,4 @@
-#===============================================================================
+# ===============================================================================
 # Copyright (C) 2010 Diego Duclos
 #
 # This file is part of eos.
@@ -15,43 +15,46 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with eos.  If not, see <http://www.gnu.org/licenses/>.
-#===============================================================================
+# ===============================================================================
 
 from sqlalchemy import Table, Column, Integer, ForeignKey, String
 from sqlalchemy.orm import relation, mapper
 
 from eos.db import saveddata_meta
 from eos.db.saveddata.implant import charImplants_table
-from eos.types import Character, User, Skill, Implant
 from eos.effectHandlerHelpers import HandledImplantBoosterList
+from eos.types import Character, User, Skill, Implant
 
 characters_table = Table("characters", saveddata_meta,
-                         Column("ID", Integer, primary_key = True),
-                         Column("name", String, nullable = False),
+                         Column("ID", Integer, primary_key=True),
+                         Column("name", String, nullable=False),
                          Column("apiID", Integer),
                          Column("apiKey", String),
                          Column("defaultChar", Integer),
-                         Column("chars", String, nullable = True),
+                         Column("chars", String, nullable=True),
                          Column("defaultLevel", Integer, nullable=True),
-                         Column("ownerID", ForeignKey("users.ID"), nullable = True))
+                         Column("alphaCloneID", Integer, nullable=True),
+                         Column("ownerID", ForeignKey("users.ID"), nullable=True))
 
 mapper(Character, characters_table,
-        properties = {
-            "_Character__owner": relation(
-                User,
-                backref = "characters"),
-            "_Character__skills": relation(
-                Skill,
-                backref="character",
-                cascade = "all,delete-orphan"),
-            "_Character__implants": relation(
-                Implant,
-                collection_class = HandledImplantBoosterList,
-                cascade='all,delete-orphan',
-                backref='character',
-                single_parent=True,
-                primaryjoin = charImplants_table.c.charID == characters_table.c.ID,
-                secondaryjoin = charImplants_table.c.implantID == Implant.ID,
-                secondary = charImplants_table),
-        }
-)
+       properties={
+           "_Character__alphaCloneID": characters_table.c.alphaCloneID,
+           "savedName": characters_table.c.name,
+           "_Character__owner": relation(
+               User,
+               backref="characters"),
+           "_Character__skills": relation(
+               Skill,
+               backref="character",
+               cascade="all,delete-orphan"),
+           "_Character__implants": relation(
+               Implant,
+               collection_class=HandledImplantBoosterList,
+               cascade='all,delete-orphan',
+               backref='character',
+               single_parent=True,
+               primaryjoin=charImplants_table.c.charID == characters_table.c.ID,
+               secondaryjoin=charImplants_table.c.implantID == Implant.ID,
+               secondary=charImplants_table),
+       }
+       )

eos/db/saveddata/crest.py

@@ -1,4 +1,4 @@
-#===============================================================================
+# ===============================================================================
 # Copyright (C) 2010 Diego Duclos
 #
 # This file is part of eos.
@@ -15,17 +15,17 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with eos.  If not, see <http://www.gnu.org/licenses/>.
-#===============================================================================
+# ===============================================================================
 
-from sqlalchemy import Table, Column, Integer, String, Boolean
+from sqlalchemy import Table, Column, Integer, String
 from sqlalchemy.orm import mapper
 
 from eos.db import saveddata_meta
 from eos.types import CrestChar
 
 crest_table = Table("crest", saveddata_meta,
-                         Column("ID", Integer, primary_key = True),
-                         Column("name", String, nullable = False, unique = True),
-                         Column("refresh_token", String, nullable = False))
+                    Column("ID", Integer, primary_key=True),
+                    Column("name", String, nullable=False, unique=True),
+                    Column("refresh_token", String, nullable=False))
 
 mapper(CrestChar, crest_table)

eos/db/saveddata/damagePattern.py

@@ -1,4 +1,4 @@
-#===============================================================================
+# ===============================================================================
 # Copyright (C) 2010 Diego Duclos
 #
 # This file is part of eos.
@@ -15,7 +15,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with eos.  If not, see <http://www.gnu.org/licenses/>.
-#===============================================================================
+# ===============================================================================
 
 from sqlalchemy import Table, Column, Integer, ForeignKey, String
 from sqlalchemy.orm import mapper
@@ -24,7 +24,7 @@ from eos.db import saveddata_meta
 from eos.types import DamagePattern
 
 damagePatterns_table = Table("damagePatterns", saveddata_meta,
-                             Column("ID", Integer, primary_key = True),
+                             Column("ID", Integer, primary_key=True),
                              Column("name", String),
                              Column("emAmount", Integer),
                              Column("thermalAmount", Integer),

eos/db/saveddata/databaseRepair.py

@@ -0,0 +1,162 @@
+# ===============================================================================
+# Copyright (C) 2010 Diego Duclos
+#
+# This file is part of pyfa.
+#
+# pyfa is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# pyfa is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with pyfa.  If not, see <http://www.gnu.org/licenses/>.
+# ===============================================================================
+
+import sqlalchemy
+import logging
+
+logger = logging.getLogger(__name__)
+
+
+class DatabaseCleanup:
+    def __init__(self):
+        pass
+
+    @staticmethod
+    def ExecuteSQLQuery(saveddata_engine, query):
+        try:
+            results = saveddata_engine.execute(query)
+            return results
+        except sqlalchemy.exc.DatabaseError:
+            logger.error("Failed to connect to database or error executing query:\n%s",query)
+            return None
+
+    @staticmethod
+    def OrphanedCharacterSkills(saveddata_engine):
+        # Find orphaned character skills.
+        # This solves an issue where the character doesn't exist, but skills for that character do.
+        # See issue #917
+        logger.debug("Running database cleanup for character skills.")
+        query = "SELECT COUNT(*) AS num FROM characterSkills WHERE characterID NOT IN (SELECT ID from characters)"
+        results = DatabaseCleanup.ExecuteSQLQuery(saveddata_engine, query)
+
+        if results is None:
+            return
+
+        row = results.first()
+
+        if row and row['num']:
+            query = "DELETE FROM characterSkills WHERE characterID NOT IN (SELECT ID from characters)"
+            delete = DatabaseCleanup.ExecuteSQLQuery(saveddata_engine, query)
+            logger.error("Database corruption found. Cleaning up %d records.", delete.rowcount)
+
+    @staticmethod
+    def OrphanedFitDamagePatterns(saveddata_engine):
+        # Find orphaned damage patterns.
+        # This solves an issue where the damage pattern doesn't exist, but fits reference the pattern.
+        # See issue #777
+        logger.debug("Running database cleanup for orphaned damage patterns attached to fits.")
+        query = "SELECT COUNT(*) AS num FROM fits WHERE damagePatternID NOT IN (SELECT ID FROM damagePatterns) OR damagePatternID IS NULL"
+        results = DatabaseCleanup.ExecuteSQLQuery(saveddata_engine, query)
+
+        if results is None:
+            return
+
+        row = results.first()
+
+        if row and row['num']:
+            # Get Uniform damage pattern ID
+            uniform_query = "SELECT ID FROM damagePatterns WHERE name = 'Uniform'"
+            uniform_results = DatabaseCleanup.ExecuteSQLQuery(saveddata_engine, uniform_query)
+
+            if uniform_results is None:
+                return
+
+            rows = uniform_results.fetchall()
+
+            if len(rows) == 0:
+                logger.error("Missing uniform damage pattern.")
+            elif len(rows) > 1:
+                logger.error("More than one uniform damage pattern found.")
+            else:
+                uniform_damage_pattern_id = rows[0]['ID']
+                update_query = "UPDATE 'fits' SET 'damagePatternID' = " + str(uniform_damage_pattern_id) + \
+                               " WHERE damagePatternID NOT IN (SELECT ID FROM damagePatterns) OR damagePatternID IS NULL"
+                update_results = DatabaseCleanup.ExecuteSQLQuery(saveddata_engine, update_query)
+                logger.error("Database corruption found. Cleaning up %d records.", update_results.rowcount)
+
+    @staticmethod
+    def OrphanedFitCharacterIDs(saveddata_engine):
+        # Find orphaned character IDs. This solves an issue where the character doesn't exist, but fits reference the pattern.
+        logger.debug("Running database cleanup for orphaned characters attached to fits.")
+        query = "SELECT COUNT(*) AS num FROM fits WHERE characterID NOT IN (SELECT ID FROM characters) OR characterID IS NULL"
+        results = DatabaseCleanup.ExecuteSQLQuery(saveddata_engine, query)
+
+        if results is None:
+            return
+
+        row = results.first()
+
+        if row and row['num']:
+            # Get All 5 character ID
+            all5_query = "SELECT ID FROM characters WHERE name = 'All 5'"
+            all5_results = DatabaseCleanup.ExecuteSQLQuery(saveddata_engine, all5_query)
+
+            if all5_results is None:
+                return
+
+            rows = all5_results.fetchall()
+
+            if len(rows) == 0:
+                logger.error("Missing 'All 5' character.")
+            elif len(rows) > 1:
+                logger.error("More than one 'All 5' character found.")
+            else:
+                all5_id = rows[0]['ID']
+                update_query = "UPDATE 'fits' SET 'characterID' = " + str(all5_id) +  \
+                               " WHERE characterID not in (select ID from characters) OR characterID IS NULL"
+                update_results = DatabaseCleanup.ExecuteSQLQuery(saveddata_engine, update_query)
+                logger.error("Database corruption found. Cleaning up %d records.", update_results.rowcount)
+
+    @staticmethod
+    def NullDamagePatternNames(saveddata_engine):
+        # Find damage patterns that are missing the name.
+        # This solves an issue where the damage pattern ends up with a name that is null.
+        # See issue #949
+        logger.debug("Running database cleanup for missing damage pattern names.")
+        query = "SELECT COUNT(*) AS num FROM damagePatterns WHERE name IS NULL OR name = ''"
+        results = DatabaseCleanup.ExecuteSQLQuery(saveddata_engine, query)
+
+        if results is None:
+            return
+
+        row = results.first()
+
+        if row and row['num']:
+            query = "DELETE FROM damagePatterns WHERE name IS NULL OR name = ''"
+            delete = DatabaseCleanup.ExecuteSQLQuery(saveddata_engine, query)
+            logger.error("Database corruption found. Cleaning up %d records.", delete.rowcount)
+
+    @staticmethod
+    def NullTargetResistNames(saveddata_engine):
+        # Find target resists that are missing the name.
+        # This solves an issue where the target resist ends up with a name that is null.
+        # See issue #949
+        logger.debug("Running database cleanup for missing target resist names.")
+        query = "SELECT COUNT(*) AS num FROM targetResists WHERE name IS NULL OR name = ''"
+        results = DatabaseCleanup.ExecuteSQLQuery(saveddata_engine, query)
+
+        if results is None:
+            return
+
+        row = results.first()
+
+        if row and row['num']:
+            query = "DELETE FROM targetResists WHERE name IS NULL OR name = ''"
+            delete = DatabaseCleanup.ExecuteSQLQuery(saveddata_engine, query)
+            logger.error("Database corruption found. Cleaning up %d records.", delete.rowcount)

eos/db/saveddata/drone.py

@@ -1,4 +1,4 @@
-#===============================================================================
+# ===============================================================================
 # Copyright (C) 2010 Diego Duclos
 #
 # This file is part of eos.
@@ -15,19 +15,20 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with eos.  If not, see <http://www.gnu.org/licenses/>.
-#===============================================================================
+# ===============================================================================
 
 from sqlalchemy import Table, Column, Integer, ForeignKey, Boolean
 from sqlalchemy.orm import mapper
+
 from eos.db import saveddata_meta
 from eos.types import Drone
 
 drones_table = Table("drones", saveddata_meta,
                      Column("groupID", Integer, primary_key=True),
-                     Column("fitID", Integer, ForeignKey("fits.ID"), nullable = False, index = True),
-                     Column("itemID", Integer, nullable = False),
-                     Column("amount", Integer, nullable = False),
-                     Column("amountActive", Integer, nullable = False),
-                     Column("projected", Boolean, default = False))
+                     Column("fitID", Integer, ForeignKey("fits.ID"), nullable=False, index=True),
+                     Column("itemID", Integer, nullable=False),
+                     Column("amount", Integer, nullable=False),
+                     Column("amountActive", Integer, nullable=False),
+                     Column("projected", Boolean, default=False))
 
 mapper(Drone, drones_table)

eos/db/saveddata/fighter.py

@@ -0,0 +1,50 @@
+# ===============================================================================
+# Copyright (C) 2010 Diego Duclos
+#
+# This file is part of eos.
+#
+# eos is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation, either version 2 of the License, or
+# (at your option) any later version.
+#
+# eos is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with eos.  If not, see <http://www.gnu.org/licenses/>.
+# ===============================================================================
+
+from sqlalchemy import Table, Column, Integer, ForeignKey, Boolean
+from sqlalchemy.orm import mapper, relation
+
+from eos.db import saveddata_meta
+from eos.types import Fighter, Fit
+from eos.types import FighterAbility
+
+fighters_table = Table("fighters", saveddata_meta,
+                       Column("groupID", Integer, primary_key=True),
+                       Column("fitID", Integer, ForeignKey("fits.ID"), nullable=False, index=True),
+                       Column("itemID", Integer, nullable=False),
+                       Column("active", Boolean, nullable=True),
+                       Column("amount", Integer, nullable=False),
+                       Column("projected", Boolean, default=False))
+
+fighter_abilities_table = Table("fightersAbilities", saveddata_meta,
+                                Column("groupID", Integer, ForeignKey("fighters.groupID"), primary_key=True,
+                                       index=True),
+                                Column("effectID", Integer, nullable=False, primary_key=True),
+                                Column("active", Boolean, default=False))
+
+mapper(Fighter, fighters_table,
+       properties={
+           "owner": relation(Fit),
+           "_Fighter__abilities": relation(
+               FighterAbility,
+               backref="fighter",
+               cascade='all, delete, delete-orphan'),
+       })
+
+mapper(FighterAbility, fighter_abilities_table)

eos/db/saveddata/fit.py

@@ -1,4 +1,4 @@
-#===============================================================================
+# ===============================================================================
 # Copyright (C) 2010 Diego Duclos
 #
 # This file is part of eos.
@@ -15,42 +15,54 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with eos.  If not, see <http://www.gnu.org/licenses/>.
-#===============================================================================
+# ===============================================================================
 
-from sqlalchemy import *
-from sqlalchemy.orm import *
-from sqlalchemy.sql import and_
 from sqlalchemy.ext.associationproxy import association_proxy
 from sqlalchemy.orm.collections import attribute_mapped_collection
+from sqlalchemy.sql import and_
+from sqlalchemy.orm import relation, reconstructor, mapper, relationship
+from sqlalchemy import ForeignKey, Column, Integer, String, Table, Boolean
 
 from eos.db import saveddata_meta
-from eos.db.saveddata.module import modules_table
-from eos.db.saveddata.drone import drones_table
+from eos.db import saveddata_session
 from eos.db.saveddata.cargo import cargo_table
+from eos.db.saveddata.drone import drones_table
+from eos.db.saveddata.fighter import fighters_table
 from eos.db.saveddata.implant import fitImplants_table
-from eos.types import Fit, Module, User, Booster, Drone, Cargo, Implant, Character, DamagePattern, TargetResists, ImplantLocation
-from eos.effectHandlerHelpers import *
+from eos.db.saveddata.module import modules_table
+from eos.effectHandlerHelpers import HandledModuleList, HandledImplantBoosterList, HandledProjectedModList, \
+    HandledDroneCargoList, HandledProjectedDroneList
+from eos.types import Fit as es_Fit, Module, User, Booster, Drone, Fighter, Cargo, Implant, Character, DamagePattern, \
+    TargetResists, ImplantLocation
 
 fits_table = Table("fits", saveddata_meta,
-                         Column("ID", Integer, primary_key = True),
-                         Column("ownerID", ForeignKey("users.ID"), nullable = True, index = True),
-                         Column("shipID", Integer, nullable = False, index = True),
-                         Column("name", String, nullable = False),
-                         Column("timestamp", Integer, nullable = False),
-                         Column("characterID", ForeignKey("characters.ID"), nullable = True),
-                         Column("damagePatternID", ForeignKey("damagePatterns.ID"), nullable=True),
-                         Column("booster", Boolean, nullable = False, index = True, default = 0),
-                         Column("targetResistsID", ForeignKey("targetResists.ID"), nullable=True),
-                         Column("modeID", Integer, nullable=True),
-                         Column("implantLocation", Integer, nullable=False, default=ImplantLocation.FIT),
-)
+                   Column("ID", Integer, primary_key=True),
+                   Column("ownerID", ForeignKey("users.ID"), nullable=True, index=True),
+                   Column("shipID", Integer, nullable=False, index=True),
+                   Column("name", String, nullable=False),
+                   Column("timestamp", Integer, nullable=False),
+                   Column("characterID", ForeignKey("characters.ID"), nullable=True),
+                   Column("damagePatternID", ForeignKey("damagePatterns.ID"), nullable=True),
+                   Column("booster", Boolean, nullable=False, index=True, default=0),
+                   Column("targetResistsID", ForeignKey("targetResists.ID"), nullable=True),
+                   Column("modeID", Integer, nullable=True),
+                   Column("implantLocation", Integer, nullable=False, default=ImplantLocation.FIT),
+                   Column("notes", String, nullable=True),
+                   )
 
 projectedFits_table = Table("projectedFits", saveddata_meta,
-                            Column("sourceID", ForeignKey("fits.ID"), primary_key = True),
-                            Column("victimID", ForeignKey("fits.ID"), primary_key = True),
-                            Column("amount", Integer, nullable = False, default = 1),
-                            Column("active", Boolean, nullable = False, default = 1),
-)
+                            Column("sourceID", ForeignKey("fits.ID"), primary_key=True),
+                            Column("victimID", ForeignKey("fits.ID"), primary_key=True),
+                            Column("amount", Integer, nullable=False, default=1),
+                            Column("active", Boolean, nullable=False, default=1),
+                            )
+
+commandFits_table = Table("commandFits", saveddata_meta,
+                          Column("boosterID", ForeignKey("fits.ID"), primary_key=True),
+                          Column("boostedID", ForeignKey("fits.ID"), primary_key=True),
+                          Column("active", Boolean, nullable=False, default=1)
+                          )
+
 
 class ProjectedFit(object):
     def __init__(self, sourceID, source_fit, amount=1, active=True):
@@ -63,9 +75,9 @@ class ProjectedFit(object):
     def init(self):
         if self.source_fit.isInvalid:
             # Very rare for this to happen, but be prepared for it
-            eos.db.saveddata_session.delete(self.source_fit)
-            eos.db.saveddata_session.flush()
-            eos.db.saveddata_session.refresh(self.victim_fit)
+            saveddata_session.delete(self.source_fit)
+            saveddata_session.flush()
+            saveddata_session.refresh(self.victim_fit)
 
     # We have a series of setters and getters here just in case someone
     # downgrades and screws up the table with NULL values
@@ -82,85 +94,137 @@ class ProjectedFit(object):
             self.sourceID, self.victimID, self.amount, self.active, hex(id(self))
         )
 
-Fit._Fit__projectedFits = association_proxy(
+
+class CommandFit(object):
+    def __init__(self, boosterID, booster_fit, active=True):
+        self.boosterID = boosterID
+        self.booster_fit = booster_fit
+        self.active = active
+
+    @reconstructor
+    def init(self):
+        if self.booster_fit.isInvalid:
+            # Very rare for this to happen, but be prepared for it
+            saveddata_session.delete(self.booster_fit)
+            saveddata_session.flush()
+            saveddata_session.refresh(self.boosted_fit)
+
+    def __repr__(self):
+        return "CommandFit(boosterID={}, boostedID={}, active={}) at {}".format(
+            self.boosterID, self.boostedID, self.active, hex(id(self))
+        )
+
+
+es_Fit._Fit__projectedFits = association_proxy(
     "victimOf",  # look at the victimOf association...
     "source_fit",  # .. and return the source fits
     creator=lambda sourceID, source_fit: ProjectedFit(sourceID, source_fit)
 )
 
-mapper(Fit, fits_table,
-        properties = {
-            "_Fit__modules": relation(
-                Module,
-                collection_class=HandledModuleList,
-                primaryjoin=and_(modules_table.c.fitID == fits_table.c.ID, modules_table.c.projected == False),
-                order_by=modules_table.c.position,
-                cascade='all, delete, delete-orphan'),
-            "_Fit__projectedModules": relation(
-                Module,
-                collection_class=HandledProjectedModList,
-                cascade='all, delete, delete-orphan',
-                single_parent=True,
-                primaryjoin=and_(modules_table.c.fitID == fits_table.c.ID, modules_table.c.projected == True)),
-            "owner": relation(
-                User,
-                backref="fits"),
-            "itemID": fits_table.c.shipID,
-            "shipID": fits_table.c.shipID,
-            "_Fit__boosters": relation(
-                Booster,
-                collection_class=HandledImplantBoosterList,
-                cascade='all, delete, delete-orphan',
-                single_parent=True),
-            "_Fit__drones": relation(
-                Drone,
-                collection_class=HandledDroneCargoList,
-                cascade='all, delete, delete-orphan',
-                single_parent=True,
-                primaryjoin=and_(drones_table.c.fitID == fits_table.c.ID, drones_table.c.projected == False)),
-            "_Fit__cargo": relation(
-                Cargo,
-                collection_class=HandledDroneCargoList,
-                cascade='all, delete, delete-orphan',
-                single_parent=True,
-                primaryjoin=and_(cargo_table.c.fitID == fits_table.c.ID)),
-            "_Fit__projectedDrones": relation(
-                Drone,
-                collection_class=HandledProjectedDroneList,
-                cascade='all, delete, delete-orphan',
-                single_parent=True,
-                primaryjoin=and_(drones_table.c.fitID == fits_table.c.ID, drones_table.c.projected == True)),
-            "_Fit__implants": relation(
-                Implant,
-                collection_class=HandledImplantBoosterList,
-                cascade='all, delete, delete-orphan',
-                backref='fit',
-                single_parent=True,
-                primaryjoin=fitImplants_table.c.fitID == fits_table.c.ID,
-                secondaryjoin=fitImplants_table.c.implantID == Implant.ID,
-                secondary=fitImplants_table),
-            "_Fit__character": relation(
-                Character,
-                backref="fits"),
-            "_Fit__damagePattern": relation(DamagePattern),
-            "_Fit__targetResists": relation(TargetResists),
-            "projectedOnto": relationship(
-                ProjectedFit,
-                primaryjoin=projectedFits_table.c.sourceID == fits_table.c.ID,
-                backref='source_fit',
-                collection_class=attribute_mapped_collection('victimID'),
-                cascade='all, delete, delete-orphan'),
-            "victimOf": relationship(
-                ProjectedFit,
-                primaryjoin=fits_table.c.ID == projectedFits_table.c.victimID,
-                backref='victim_fit',
-                collection_class=attribute_mapped_collection('sourceID'),
-                cascade='all, delete, delete-orphan'),
-       }
+es_Fit._Fit__commandFits = association_proxy(
+    "boostedOf",  # look at the boostedOf association...
+    "booster_fit",  # .. and return the booster fit
+    creator=lambda boosterID, booster_fit: CommandFit(boosterID, booster_fit)
 )
+mapper(es_Fit, fits_table,
+       properties={
+           "_Fit__modules": relation(
+               Module,
+               collection_class=HandledModuleList,
+               primaryjoin=and_(modules_table.c.fitID == fits_table.c.ID, modules_table.c.projected == False), # noqa
+               order_by=modules_table.c.position,
+               cascade='all, delete, delete-orphan'),
+           "_Fit__projectedModules": relation(
+               Module,
+               collection_class=HandledProjectedModList,
+               cascade='all, delete, delete-orphan',
+               single_parent=True,
+               primaryjoin=and_(modules_table.c.fitID == fits_table.c.ID, modules_table.c.projected == True)), # noqa
+           "owner": relation(
+               User,
+               backref="fits"),
+           "itemID": fits_table.c.shipID,
+           "shipID": fits_table.c.shipID,
+           "_Fit__boosters": relation(
+               Booster,
+               collection_class=HandledImplantBoosterList,
+               cascade='all, delete, delete-orphan',
+               single_parent=True),
+           "_Fit__drones": relation(
+               Drone,
+               collection_class=HandledDroneCargoList,
+               cascade='all, delete, delete-orphan',
+               single_parent=True,
+               primaryjoin=and_(drones_table.c.fitID == fits_table.c.ID, drones_table.c.projected == False)), # noqa
+           "_Fit__fighters": relation(
+               Fighter,
+               collection_class=HandledDroneCargoList,
+               cascade='all, delete, delete-orphan',
+               single_parent=True,
+               primaryjoin=and_(fighters_table.c.fitID == fits_table.c.ID, fighters_table.c.projected == False)), # noqa
+           "_Fit__cargo": relation(
+               Cargo,
+               collection_class=HandledDroneCargoList,
+               cascade='all, delete, delete-orphan',
+               single_parent=True,
+               primaryjoin=and_(cargo_table.c.fitID == fits_table.c.ID)),
+           "_Fit__projectedDrones": relation(
+               Drone,
+               collection_class=HandledProjectedDroneList,
+               cascade='all, delete, delete-orphan',
+               single_parent=True,
+               primaryjoin=and_(drones_table.c.fitID == fits_table.c.ID, drones_table.c.projected == True)), # noqa
+           "_Fit__projectedFighters": relation(
+               Fighter,
+               collection_class=HandledProjectedDroneList,
+               cascade='all, delete, delete-orphan',
+               single_parent=True,
+               primaryjoin=and_(fighters_table.c.fitID == fits_table.c.ID, fighters_table.c.projected == True)), # noqa
+           "_Fit__implants": relation(
+               Implant,
+               collection_class=HandledImplantBoosterList,
+               cascade='all, delete, delete-orphan',
+               backref='fit',
+               single_parent=True,
+               primaryjoin=fitImplants_table.c.fitID == fits_table.c.ID,
+               secondaryjoin=fitImplants_table.c.implantID == Implant.ID,
+               secondary=fitImplants_table),
+           "_Fit__character": relation(
+               Character,
+               backref="fits"),
+           "_Fit__damagePattern": relation(DamagePattern),
+           "_Fit__targetResists": relation(TargetResists),
+           "projectedOnto": relationship(
+               ProjectedFit,
+               primaryjoin=projectedFits_table.c.sourceID == fits_table.c.ID,
+               backref='source_fit',
+               collection_class=attribute_mapped_collection('victimID'),
+               cascade='all, delete, delete-orphan'),
+           "victimOf": relationship(
+               ProjectedFit,
+               primaryjoin=fits_table.c.ID == projectedFits_table.c.victimID,
+               backref='victim_fit',
+               collection_class=attribute_mapped_collection('sourceID'),
+               cascade='all, delete, delete-orphan'),
+           "boostedOnto": relationship(
+               CommandFit,
+               primaryjoin=commandFits_table.c.boosterID == fits_table.c.ID,
+               backref='booster_fit',
+               collection_class=attribute_mapped_collection('boostedID'),
+               cascade='all, delete, delete-orphan'),
+           "boostedOf": relationship(
+               CommandFit,
+               primaryjoin=fits_table.c.ID == commandFits_table.c.boostedID,
+               backref='boosted_fit',
+               collection_class=attribute_mapped_collection('boosterID'),
+               cascade='all, delete, delete-orphan'),
+       }
+       )
 
 mapper(ProjectedFit, projectedFits_table,
-       properties = {
-            "_ProjectedFit__amount": projectedFits_table.c.amount,
+       properties={
+           "_ProjectedFit__amount": projectedFits_table.c.amount,
        }
-)
+       )
+
+mapper(CommandFit, commandFits_table)

eos/db/saveddata/fleet.py

@@ -1,66 +0,0 @@
-#===============================================================================
-# Copyright (C) 2010 Diego Duclos
-#
-# This file is part of eos.
-#
-# eos is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License as published by
-# the Free Software Foundation, either version 2 of the License, or
-# (at your option) any later version.
-#
-# eos is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with eos.  If not, see <http://www.gnu.org/licenses/>.
-#===============================================================================
-
-from sqlalchemy import Table, Column, Integer, ForeignKey, String
-from sqlalchemy.orm import mapper, relation
-
-from eos.db import saveddata_meta
-from eos.types import Fleet, Wing, Squad, Fit
-from eos.db.saveddata.fit import fits_table
-
-gangs_table = Table("gangs", saveddata_meta,
-                    Column("ID", Integer, primary_key = True),
-                    Column("leaderID", ForeignKey("fits.ID")),
-                    Column("boosterID", ForeignKey("fits.ID")),
-                    Column("name", String))
-
-wings_table = Table("wings", saveddata_meta,
-                    Column("ID", Integer, primary_key = True),
-                    Column("gangID", ForeignKey("gangs.ID")),
-                    Column("boosterID", ForeignKey("fits.ID")),
-                    Column("leaderID", ForeignKey("fits.ID")))
-
-squads_table = Table("squads", saveddata_meta,
-                     Column("ID", Integer, primary_key = True),
-                     Column("wingID", ForeignKey("wings.ID")),
-                     Column("leaderID", ForeignKey("fits.ID")),
-                     Column("boosterID", ForeignKey("fits.ID")))
-
-squadmembers_table = Table("squadmembers", saveddata_meta,
-                           Column("squadID", ForeignKey("squads.ID"), primary_key = True),
-                           Column("memberID", ForeignKey("fits.ID"), primary_key = True))
-
-mapper(Fleet, gangs_table,
-       properties = {"wings" : relation(Wing, backref="gang"),
-                     "leader" : relation(Fit, primaryjoin = gangs_table.c.leaderID == fits_table.c.ID),
-                     "booster": relation(Fit, primaryjoin = gangs_table.c.boosterID == fits_table.c.ID)})
-
-mapper(Wing, wings_table,
-       properties = {"squads" : relation(Squad, backref="wing"),
-                     "leader" : relation(Fit, primaryjoin = wings_table.c.leaderID == fits_table.c.ID),
-                     "booster": relation(Fit, primaryjoin = wings_table.c.boosterID == fits_table.c.ID)})
-
-mapper(Squad, squads_table,
-       properties = {"leader" : relation(Fit, primaryjoin = squads_table.c.leaderID == fits_table.c.ID),
-                     "booster" : relation(Fit, primaryjoin = squads_table.c.boosterID == fits_table.c.ID),
-                     "members" : relation(Fit,
-                                          primaryjoin = squads_table.c.ID == squadmembers_table.c.squadID,
-                                          secondaryjoin = squadmembers_table.c.memberID == fits_table.c.ID,
-                                          secondary = squadmembers_table)})
-

eos/db/saveddata/implant.py

@@ -1,4 +1,4 @@
-#===============================================================================
+# ===============================================================================
 # Copyright (C) 2010 Diego Duclos
 #
 # This file is part of eos.
@@ -15,7 +15,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with eos.  If not, see <http://www.gnu.org/licenses/>.
-#===============================================================================
+# ===============================================================================
 
 from sqlalchemy import Table, Column, Integer, ForeignKey, Boolean
 from sqlalchemy.orm import mapper
@@ -24,16 +24,20 @@ from eos.db import saveddata_meta
 from eos.types import Implant
 
 implants_table = Table("implants", saveddata_meta,
-                     Column("ID", Integer, primary_key = True),
-                     Column("itemID", Integer),
-                     Column("active", Boolean))
+                       Column("ID", Integer, primary_key=True),
+                       Column("itemID", Integer),
+                       Column("active", Boolean))
 
 fitImplants_table = Table("fitImplants", saveddata_meta,
-                          Column("fitID", ForeignKey("fits.ID"), index = True),
-                          Column("implantID", ForeignKey("implants.ID"), primary_key = True))
+                          Column("fitID", ForeignKey("fits.ID"), index=True),
+                          Column("implantID", ForeignKey("implants.ID"), primary_key=True))
 
 charImplants_table = Table("charImplants", saveddata_meta,
-                           Column("charID", ForeignKey("characters.ID"), index = True),
-                           Column("implantID", ForeignKey("implants.ID"), primary_key = True))
+                           Column("charID", ForeignKey("characters.ID"), index=True),
+                           Column("implantID", ForeignKey("implants.ID"), primary_key=True))
+
+implantsSetMap_table = Table("implantSetMap", saveddata_meta,
+                             Column("setID", ForeignKey("implantSets.ID"), index=True),
+                             Column("implantID", ForeignKey("implants.ID"), primary_key=True))
 
 mapper(Implant, implants_table)

eos/db/saveddata/implantSet.py

@@ -0,0 +1,45 @@
+# ===============================================================================
+# Copyright (C) 2016 Ryan Holmes
+#
+# This file is part of eos.
+#
+# eos is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation, either version 2 of the License, or
+# (at your option) any later version.
+#
+# eos is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with eos.  If not, see <http://www.gnu.org/licenses/>.
+# ===============================================================================
+
+from sqlalchemy import Table, Column, Integer, String
+from sqlalchemy.orm import relation, mapper
+
+from eos.db import saveddata_meta
+from eos.db.saveddata.implant import implantsSetMap_table
+from eos.effectHandlerHelpers import HandledImplantBoosterList
+from eos.types import Implant, ImplantSet
+
+implant_set_table = Table("implantSets", saveddata_meta,
+                          Column("ID", Integer, primary_key=True),
+                          Column("name", String, nullable=False),
+                          )
+
+mapper(ImplantSet, implant_set_table,
+       properties={
+           "_ImplantSet__implants": relation(
+               Implant,
+               collection_class=HandledImplantBoosterList,
+               cascade='all, delete, delete-orphan',
+               backref='set',
+               single_parent=True,
+               primaryjoin=implantsSetMap_table.c.setID == implant_set_table.c.ID,
+               secondaryjoin=implantsSetMap_table.c.implantID == Implant.ID,
+               secondary=implantsSetMap_table),
+       }
+       )

eos/db/saveddata/loadDefaultDatabaseValues.py

@@ -0,0 +1,198 @@
+# ===============================================================================
+# Copyright (C) 2010 Diego Duclos
+#
+# This file is part of pyfa.
+#
+# pyfa is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# pyfa is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with pyfa.  If not, see <http://www.gnu.org/licenses/>.
+# ===============================================================================
+
+import eos.db
+from eos.saveddata.damagePattern import DamagePattern as es_DamagePattern
+from eos.saveddata.targetResists import TargetResists as es_TargetResists
+
+
+class ImportError(Exception):
+    pass
+
+
+class DefaultDatabaseValues():
+    def __init__(self):
+        pass
+
+    instance = None
+
+    @classmethod
+    def importDamageProfileDefaults(cls):
+        damageProfileList = [["Uniform", "25", "25", "25", "25"], ["[Generic]EM", "100", "0", "0", "0"],
+                             ["[Generic]Thermal", "0", "100", "0", "0"], ["[Generic]Kinetic", "0", "0", "100", "0"],
+                             ["[Generic]Explosive", "0", "0", "0", "100"],
+                             ["[NPC][Asteroid] Blood Raiders", "5067", "4214", "0", "0"],
+                             ["[Bombs]Concussion Bomb", "0", "0", "6400", "0"],
+                             ["[Bombs]Electron Bomb", "6400", "0", "0", "0"],
+                             ["[Bombs]Scorch Bomb", "0", "6400", "0", "0"],
+                             ["[Bombs]Shrapnel Bomb", "0", "0", "0", "6400"],
+                             ["[Frequency Crystals][T2] Gleam", "56", "56", "0", "0"],
+                             ["[Frequency Crystals][T2] Aurora", "40", "24", "0", "0"],
+                             ["[Frequency Crystals][T2] Scorch", "72", "16", "0", "0"],
+                             ["[Frequency Crystals][T2] Conflagration", "61.6", "61.6", "0", "0"],
+                             ["[Frequency Crystals]Gamma", "61.6", "35.2", "0", "0"],
+                             ["[Frequency Crystals]Infrared", "44", "17.6", "0", "0"],
+                             ["[Frequency Crystals]Microwave", "35.2", "17.6", "0", "0"],
+                             ["[Frequency Crystals]Multifrequency", "61.6", "44", "0", "0"],
+                             ["[Frequency Crystals]Radio", "44", "0", "0", "0"],
+                             ["[Frequency Crystals]Standard", "44", "26.4", "0", "0"],
+                             ["[Frequency Crystals]Ultraviolet", "52.8", "26.4", "0", "0"],
+                             ["[Frequency Crystals]Xray", "52.8", "35.2", "0", "0"],
+                             ["[Hybrid Charges][T2] Void", "0", "61.6", "61.6", "0"],
+                             ["[Hybrid Charges][T2] Null", "0", "48", "40", "0"],
+                             ["[Hybrid Charges][T2] Javelin", "0", "64", "48", "0"],
+                             ["[Hybrid Charges][T2] Spike", "0", "32", "32", "0"],
+                             ["[Hybrid Charges]Antimatter", "0", "48", "67.2", "0"],
+                             ["[Hybrid Charges]Iridium", "0", "28.8", "38.4", "0"],
+                             ["[Hybrid Charges]Iron", "0", "19.2", "28.8", "0"],
+                             ["[Hybrid Charges]Lead", "0", "28.8", "48", "0"],
+                             ["[Hybrid Charges]Plutonium", "0", "48", "57.6", "0"],
+                             ["[Hybrid Charges]Thorium", "0", "38.4", "48", "0"],
+                             ["[Hybrid Charges]Tungsten", "0", "19.2", "38.4", "0"],
+                             ["[Hybrid Charges]Uranium", "0", "38.4", "57.6", "0"],
+                             ["[Missiles]Mjolnir", "100", "0", "0", "0"], ["[Missiles]Inferno", "0", "100", "0", "0"],
+                             ["[Missiles]Scourge", "0", "0", "100", "0"], ["[Missiles]Nova", "0", "0", "0", "100"],
+                             ["[Missiles][Structure) Standup Missile", "100", "100", "100", "100"],
+                             ["[Projectile Ammo][T2] Tremor", "0", "0", "24", "40"],
+                             ["[Projectile Ammo][T2] Quake", "0", "0", "40", "72"],
+                             ["[Projectile Ammo][T2] Hail", "0", "0", "26.4", "96.8"],
+                             ["[Projectile Ammo][T2] Barrage", "0", "0", "40", "48"],
+                             ["[Projectile Ammo]Carbonized Lead", "0", "0", "35.2", "8.8"],
+                             ["[Projectile Ammo]Depleted Uranium", "0", "26.4", "17.6", "26.4"],
+                             ["[Projectile Ammo]EMP", "79.2", "0", "8.8", "17.6"],
+                             ["[Projectile Ammo]Fusion", "0", "0", "17.6", "88"],
+                             ["[Projectile Ammo]Nuclear", "0", "0", "8.8", "35.2"],
+                             ["[Projectile Ammo]Phased Plasma", "0", "88", "17.6", "0"],
+                             ["[Projectile Ammo]Proton", "26.4", "0", "17.6", "0"],
+                             ["[Projectile Ammo]Titanium Sabot", "0", "0", "52.8", "176"],
+                             ["[NPC][Burner] Cruor (Blood Raiders)", "90", "90", "0", "0"],
+                             ["[NPC][Burner] Dramiel (Angel)", "55", "0", "20", "96"],
+                             ["[NPC][Burner] Daredevil (Serpentis)", "0", "110", "154", "0"],
+                             ["[NPC][Burner] Succubus (Sanshas Nation)", "135", "30", "0", "0"],
+                             ["[NPC][Burner] Worm (Guristas)", "0", "0", "228", "0"],
+                             ["[NPC][Burner] Enyo", "0", "147", "147", "0"],
+                             ["[NPC][Burner] Hawk", "0", "0", "247", "0"],
+                             ["[NPC][Burner] Jaguar", "36", "0", "50", "182"],
+                             ["[NPC][Burner] Vengeance", "232", "0", "0", "0"],
+                             ["[NPC][Burner] Ashimmu (Blood Raiders)", "260", "100", "0", "0"],
+                             ["[NPC][Burner] Talos", "0", "413", "413", "0"],
+                             ["[NPC][Burner] Sentinel", "0", "75", "0", "90"],
+                             ["[NPC][Asteroid] Angel Cartel", "1838", "562", "2215", "3838"],
+                             ["[NPC][Deadspace] Angel Cartel", "369", "533", "1395", "3302"],
+                             ["[NPC][Deadspace] Blood Raiders", "6040", "5052", "10", "15"],
+                             ["[NPC][Asteroid] Guristas", "0", "1828", "7413", "0"],
+                             ["[NPC][Deadspace] Guristas", "0", "1531", "9680", "0"],
+                             ["[NPC][Asteroid] Rogue Drone", "394", "666", "1090", "1687"],
+                             ["[NPC][Deadspace] Rogue Drone", "276", "1071", "1069", "871"],
+                             ["[NPC][Asteroid] Sanshas Nation", "5586", "4112", "0", "0"],
+                             ["[NPC][Deadspace] Sanshas Nation", "3009", "2237", "0", "0"],
+                             ["[NPC][Asteroid] Serpentis", "0", "5373", "4813", "0"],
+                             ["[NPC][Deadspace] Serpentis", "0", "3110", "1929", "0"],
+                             ["[NPC][Mission] Amarr Empire", "4464", "3546", "97", "0"],
+                             ["[NPC][Mission] Caldari State", "0", "2139", "4867", "0"],
+                             ["[NPC][Mission] CONCORD", "336", "134", "212", "412"],
+                             ["[NPC][Mission] Gallente Federation", "9", "3712", "2758", "0"],
+                             ["[NPC][Mission] Khanid", "612", "483", "43", "6"],
+                             ["[NPC][Mission] Minmatar Republic", "1024", "388", "1655", "4285"],
+                             ["[NPC][Mission] Mordus Legion", "25", "262", "625", "0"],
+                             ["[NPC][Mission] Thukker", "0", "52", "10", "79"],
+                             ["[NPC][Other] Sleepers", "1472", "1472", "1384", "1384"],
+                             ["[NPC][Other] Sansha Incursion", "1682", "1347", "3678", "3678"]]
+
+        for damageProfileRow in damageProfileList:
+            name, em, therm, kin, exp = damageProfileRow
+            damageProfile = eos.db.getDamagePattern(name)
+            if damageProfile is None:
+                damageProfile = es_DamagePattern(em, therm, kin, exp)
+                damageProfile.name = name
+                eos.db.save(damageProfile)
+
+    @classmethod
+    def importResistProfileDefaults(cls):
+        targetResistProfileList = [["Uniform (25%)", "0.25", "0.25", "0.25", "0.25"],
+                                   ["Uniform (50%)", "0.50", "0.50", "0.50", "0.50"],
+                                   ["Uniform (75%)", "0.75", "0.75", "0.75", "0.75"],
+                                   ["Uniform (90%)", "0.90", "0.90", "0.90", "0.90"],
+                                   ["[T1 Resist]Shield", "0.0", "0.20", "0.40", "0.50"],
+                                   ["[T1 Resist]Armor", "0.50", "0.45", "0.25", "0.10"],
+                                   ["[T1 Resist]Hull", "0.33", "0.33", "0.33", "0.33"],
+                                   ["[T1 Resist]Shield (+T2 DCU)", "0.125", "0.30", "0.475", "0.562"],
+                                   ["[T1 Resist]Armor (+T2 DCU)", "0.575", "0.532", "0.363", "0.235"],
+                                   ["[T1 Resist]Hull (+T2 DCU)", "0.598", "0.598", "0.598", "0.598"],
+                                   ["[T2 Resist]Amarr (Shield)", "0.0", "0.20", "0.70", "0.875"],
+                                   ["[T2 Resist]Amarr (Armor)", "0.50", "0.35", "0.625", "0.80"],
+                                   ["[T2 Resist]Caldari (Shield)", "0.20", "0.84", "0.76", "0.60"],
+                                   ["[T2 Resist]Caldari (Armor)", "0.50", "0.8625", "0.625", "0.10"],
+                                   ["[T2 Resist]Gallente (Shield)", "0.0", "0.60", "0.85", "0.50"],
+                                   ["[T2 Resist]Gallente (Armor)", "0.50", "0.675", "0.8375", "0.10"],
+                                   ["[T2 Resist]Minmatar (Shield)", "0.75", "0.60", "0.40", "0.50"],
+                                   ["[T2 Resist]Minmatar (Armor)", "0.90", "0.675", "0.25", "0.10"],
+                                   ["[NPC][Asteroid] Angel Cartel", "0.54", "0.42", "0.37", "0.32"],
+                                   ["[NPC][Asteroid] Blood Raiders", "0.34", "0.39", "0.45", "0.52"],
+                                   ["[NPC][Asteroid] Guristas", "0.55", "0.35", "0.3", "0.48"],
+                                   ["[NPC][Asteroid] Rogue Drones", "0.35", "0.38", "0.44", "0.49"],
+                                   ["[NPC][Asteroid] Sanshas Nation", "0.35", "0.4", "0.47", "0.53"],
+                                   ["[NPC][Asteroid] Serpentis", "0.49", "0.38", "0.29", "0.51"],
+                                   ["[NPC][Deadspace] Angel Cartel", "0.59", "0.48", "0.4", "0.32"],
+                                   ["[NPC][Deadspace] Blood Raiders", "0.31", "0.39", "0.47", "0.56"],
+                                   ["[NPC][Deadspace] Guristas", "0.57", "0.39", "0.31", "0.5"],
+                                   ["[NPC][Deadspace] Rogue Drones", "0.42", "0.42", "0.47", "0.49"],
+                                   ["[NPC][Deadspace] Sanshas Nation", "0.31", "0.39", "0.47", "0.56"],
+                                   ["[NPC][Deadspace] Serpentis", "0.49", "0.38", "0.29", "0.56"],
+                                   ["[NPC][Mission] Amarr Empire", "0.34", "0.38", "0.42", "0.46"],
+                                   ["[NPC][Mission] Caldari State", "0.51", "0.38", "0.3", "0.51"],
+                                   ["[NPC][Mission] CONCORD", "0.47", "0.46", "0.47", "0.47"],
+                                   ["[NPC][Mission] Gallente Federation", "0.51", "0.38", "0.31", "0.52"],
+                                   ["[NPC][Mission] Khanid", "0.51", "0.42", "0.36", "0.4"],
+                                   ["[NPC][Mission] Minmatar Republic", "0.51", "0.46", "0.41", "0.35"],
+                                   ["[NPC][Mission] Mordus Legion", "0.32", "0.48", "0.4", "0.62"],
+                                   ["[NPC][Other] Sleeper", "0.61", "0.61", "0.61", "0.61"],
+                                   ["[NPC][Other] Sansha Incursion", "0.65", "0.63", "0.64", "0.65"],
+                                   ["[NPC][Burner] Cruor (Blood Raiders)", "0.8", "0.73", "0.69", "0.67"],
+                                   ["[NPC][Burner] Dramiel (Angel)", "0.35", "0.48", "0.61", "0.68"],
+                                   ["[NPC][Burner] Daredevil (Serpentis)", "0.69", "0.59", "0.59", "0.43"],
+                                   ["[NPC][Burner] Succubus (Sanshas Nation)", "0.35", "0.48", "0.61", "0.68"],
+                                   ["[NPC][Burner] Worm (Guristas)", "0.48", "0.58", "0.69", "0.74"],
+                                   ["[NPC][Burner] Enyo", "0.58", "0.72", "0.86", "0.24"],
+                                   ["[NPC][Burner] Hawk", "0.3", "0.86", "0.79", "0.65"],
+                                   ["[NPC][Burner] Jaguar", "0.78", "0.65", "0.48", "0.56"],
+                                   ["[NPC][Burner] Vengeance", "0.66", "0.56", "0.75", "0.86"],
+                                   ["[NPC][Burner] Ashimmu (Blood Raiders)", "0.8", "0.76", "0.68", "0.7"],
+                                   ["[NPC][Burner] Talos", "0.68", "0.59", "0.59", "0.43"],
+                                   ["[NPC][Burner] Sentinel", "0.58", "0.45", "0.52", "0.66"]]
+
+        for targetResistProfileRow in targetResistProfileList:
+            name, em, therm, kin, exp = targetResistProfileRow
+            resistsProfile = eos.db.eos.db.getTargetResists(name)
+            if resistsProfile is None:
+                resistsProfile = es_TargetResists(em, therm, kin, exp)
+                resistsProfile.name = name
+                eos.db.save(resistsProfile)
+
+    @classmethod
+    def importRequiredDefaults(cls):
+        damageProfileList = [["Uniform", "25", "25", "25", "25"]]
+
+        for damageProfileRow in damageProfileList:
+            name, em, therm, kin, exp = damageProfileRow
+            damageProfile = eos.db.getDamagePattern(name)
+            if damageProfile is None:
+                damageProfile = es_DamagePattern(em, therm, kin, exp)
+                damageProfile.name = name
+                eos.db.save(damageProfile)

eos/db/saveddata/miscData.py

@@ -1,4 +1,4 @@
-#===============================================================================
+# ===============================================================================
 # Copyright (C) 2011 Anton Vorobyov
 #
 # This file is part of eos.
@@ -15,15 +15,16 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with eos.  If not, see <http://www.gnu.org/licenses/>.
-#===============================================================================
+# ===============================================================================
 
 from sqlalchemy import Column, Table, String
 from sqlalchemy.orm import mapper
-from eos.types import MiscData
+
 from eos.db import saveddata_meta
+from eos.types import MiscData
 
 miscdata_table = Table("miscdata", saveddata_meta,
-                           Column("fieldName", String, primary_key=True),
-                           Column("fieldValue", String))
+                       Column("fieldName", String, primary_key=True),
+                       Column("fieldValue", String))
 
 mapper(MiscData, miscdata_table)

eos/db/saveddata/module.py

@@ -1,4 +1,4 @@
-#===============================================================================
+# ===============================================================================
 # Copyright (C) 2010 Diego Duclos
 #
 # This file is part of eos.
@@ -15,7 +15,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with eos.  If not, see <http://www.gnu.org/licenses/>.
-#===============================================================================
+# ===============================================================================
 
 from sqlalchemy import Table, Column, Integer, ForeignKey, CheckConstraint, Boolean
 from sqlalchemy.orm import relation, mapper
@@ -24,16 +24,15 @@ from eos.db import saveddata_meta
 from eos.types import Module, Fit
 
 modules_table = Table("modules", saveddata_meta,
-                      Column("ID", Integer, primary_key = True),
-                      Column("fitID", Integer, ForeignKey("fits.ID"), nullable = False, index = True),
-                      Column("itemID", Integer, nullable = True),
-                      Column("dummySlot", Integer, nullable = True, default = None),
+                      Column("ID", Integer, primary_key=True),
+                      Column("fitID", Integer, ForeignKey("fits.ID"), nullable=False, index=True),
+                      Column("itemID", Integer, nullable=True),
+                      Column("dummySlot", Integer, nullable=True, default=None),
                       Column("chargeID", Integer),
                       Column("state", Integer, CheckConstraint("state >= -1"), CheckConstraint("state <= 2")),
-                      Column("projected", Boolean, default = False, nullable = False),
+                      Column("projected", Boolean, default=False, nullable=False),
                       Column("position", Integer),
                       CheckConstraint('("dummySlot" = NULL OR "itemID" = NULL) AND "dummySlot" != "itemID"'))
 
 mapper(Module, modules_table,
-       properties = {"owner" : relation(Fit)})
-
+       properties={"owner": relation(Fit)})

eos/db/saveddata/override.py

@@ -1,4 +1,4 @@
-#===============================================================================
+# ===============================================================================
 # Copyright (C) 2010 Diego Duclos
 #
 # This file is part of eos.
@@ -15,7 +15,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with eos.  If not, see <http://www.gnu.org/licenses/>.
-#===============================================================================
+# ===============================================================================
 
 from sqlalchemy import Table, Column, Integer, Float
 from sqlalchemy.orm import mapper
@@ -24,8 +24,8 @@ from eos.db import saveddata_meta
 from eos.types import Override
 
 overrides_table = Table("overrides", saveddata_meta,
-                     Column("itemID", Integer, primary_key=True,  index = True),
-                     Column("attrID", Integer, primary_key=True, index = True),
-                     Column("value", Float, nullable = False))
+                        Column("itemID", Integer, primary_key=True, index=True),
+                        Column("attrID", Integer, primary_key=True, index=True),
+                        Column("value", Float, nullable=False))
 
 mapper(Override, overrides_table)

eos/db/saveddata/price.py

@@ -1,4 +1,4 @@
-#===============================================================================
+# ===============================================================================
 # Copyright (C) 2010 Diego Duclos
 #
 # This file is part of eos.
@@ -15,17 +15,18 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with eos.  If not, see <http://www.gnu.org/licenses/>.
-#===============================================================================
+# ===============================================================================
 
 from sqlalchemy import Table, Column, Float, Integer
 from sqlalchemy.orm import mapper
+
 from eos.db import saveddata_meta
 from eos.types import Price
 
 prices_table = Table("prices", saveddata_meta,
                      Column("typeID", Integer, primary_key=True),
                      Column("price", Float),
-                     Column("time", Integer, nullable = False),
+                     Column("time", Integer, nullable=False),
                      Column("failed", Integer))
 
 mapper(Price, prices_table)

eos/db/saveddata/queries.py

@@ -1,4 +1,4 @@
-#===============================================================================
+# ===============================================================================
 # Copyright (C) 2010 Diego Duclos
 #
 # This file is part of eos.
@@ -15,13 +15,16 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with eos.  If not, see <http://www.gnu.org/licenses/>.
-#===============================================================================
+# ===============================================================================
 
+from sqlalchemy.sql import and_
+
+from eos.db import saveddata_session, sd_lock
+from eos.db.saveddata.fit import projectedFits_table
 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, Override, CrestChar
-from eos.db.saveddata.fleet import squadmembers_table
+from eos.types import *
 from eos.db.saveddata.fit import projectedFits_table
 from sqlalchemy.sql import and_
 import eos.config
@@ -29,13 +32,17 @@ import eos.config
 configVal = getattr(eos.config, "saveddataCache", None)
 if configVal is True:
     import weakref
+
     itemCache = {}
     queryCache = {}
+
     def cachedQuery(type, amount, *keywords):
         itemCache[type] = localItemCache = weakref.WeakValueDictionary()
         queryCache[type] = typeQueryCache = {}
+
         def deco(function):
             localQueryCache = typeQueryCache[function] = {}
+
             def setCache(cacheKey, args, kwargs):
                 items = function(*args, **kwargs)
                 IDs = set()
@@ -44,7 +51,7 @@ if configVal is True:
                 for item in stuff:
                     ID = getattr(item, "ID", None)
                     if ID is None:
-                        #Some uncachable data, don't cache this query
+                        # Some uncachable data, don't cache this query
                         del localQueryCache[cacheKey]
                         break
                     localItemCache[ID] = item
@@ -70,7 +77,7 @@ if configVal is True:
                         for ID in IDs:
                             data = localItemCache.get(ID)
                             if data is None:
-                                #Fuck, some of our stuff isn't cached it seems.
+                                # Fuck, some of our stuff isn't cached it seems.
                                 items = setCache(cacheKey, args, kwargs)
                                 break
                             items.append(data)
@@ -82,11 +89,13 @@ if configVal is True:
                             break
 
                 return items
+
             return checkAndReturn
+
         return deco
 
     def removeCachedEntry(type, ID):
-        if not type in queryCache:
+        if type not in queryCache:
             return
         functionCache = queryCache[type]
         for _, localCache in functionCache.iteritems():
@@ -111,11 +120,13 @@ else:
                 return function(*args, **kwargs)
 
             return checkAndReturn
+
         return deco
 
     def removeCachedEntry(*args, **kwargs):
         return
 
+
 def sqlizeString(line):
     # Escape backslashes first, as they will be as escape symbol in queries
     # Then escape percent and underscore signs
@@ -123,6 +134,7 @@ def sqlizeString(line):
     line = line.replace("\\", "\\\\").replace("%", "\\%").replace("_", "\\_").replace("*", "%")
     return line
 
+
 @cachedQuery(User, 1, "lookfor")
 def getUser(lookfor, eager=None):
     if isinstance(lookfor, int):
@@ -141,6 +153,7 @@ def getUser(lookfor, eager=None):
         raise TypeError("Need integer or string as argument")
     return user
 
+
 @cachedQuery(Character, 1, "lookfor")
 def getCharacter(lookfor, eager=None):
     if isinstance(lookfor, int):
@@ -154,17 +167,20 @@ def getCharacter(lookfor, eager=None):
     elif isinstance(lookfor, basestring):
         eager = processEager(eager)
         with sd_lock:
-            character = saveddata_session.query(Character).options(*eager).filter(Character.name == lookfor).first()
+            character = saveddata_session.query(Character).options(*eager).filter(
+                Character.savedName == lookfor).first()
     else:
         raise TypeError("Need integer or string as argument")
     return character
 
+
 def getCharacterList(eager=None):
     eager = processEager(eager)
     with sd_lock:
         characters = saveddata_session.query(Character).options(*eager).all()
     return characters
 
+
 def getCharactersForUser(lookfor, eager=None):
     if isinstance(lookfor, int):
         eager = processEager(eager)
@@ -174,6 +190,7 @@ def getCharactersForUser(lookfor, eager=None):
         raise TypeError("Need integer as argument")
     return characters
 
+
 @cachedQuery(Fit, 1, "lookfor")
 def getFit(lookfor, eager=None):
     if isinstance(lookfor, int):
@@ -194,47 +211,6 @@ def getFit(lookfor, eager=None):
 
     return fit
 
-@cachedQuery(Fleet, 1, "fleetID")
-def getFleet(fleetID, eager=None):
-    if isinstance(fleetID, int):
-        if eager is None:
-            with sd_lock:
-                fleet = saveddata_session.query(Fleet).get(fleetID)
-        else:
-            eager = processEager(eager)
-            with sd_lock:
-                fleet = saveddata_session.query(Fleet).options(*eager).filter(Fleet.ID == fleetID).first()
-    else:
-        raise TypeError("Need integer as argument")
-    return fleet
-
-@cachedQuery(Wing, 1, "wingID")
-def getWing(wingID, eager=None):
-    if isinstance(wingID, int):
-        if eager is None:
-            with sd_lock:
-                wing = saveddata_session.query(Wing).get(wingID)
-        else:
-            eager = processEager(eager)
-            with sd_lock:
-                wing = saveddata_session.query(Wing).options(*eager).filter(Wing.ID == wingID).first()
-    else:
-        raise TypeError("Need integer as argument")
-    return wing
-
-@cachedQuery(Squad, 1, "squadID")
-def getSquad(squadID, eager=None):
-    if isinstance(squadID, int):
-        if eager is None:
-            with sd_lock:
-                squad = saveddata_session.query(Squad).get(squadID)
-        else:
-            eager = processEager(eager)
-            with sd_lock:
-                squad = saveddata_session.query(Squad).options(*eager).filter(Fleet.ID == squadID).first()
-    else:
-        raise TypeError("Need integer as argument")
-    return squad
 
 def getFitsWithShip(shipID, ownerID=None, where=None, eager=None):
     """
@@ -257,6 +233,7 @@ def getFitsWithShip(shipID, ownerID=None, where=None, eager=None):
 
     return fits
 
+
 def getBoosterFits(ownerID=None, where=None, eager=None):
     """
     Get all the fits that are flagged as a boosting ship
@@ -276,31 +253,41 @@ def getBoosterFits(ownerID=None, where=None, eager=None):
 
     return fits
 
+
 def countAllFits():
     with sd_lock:
         count = saveddata_session.query(Fit).count()
     return count
 
-def countFitsWithShip(shipID, ownerID=None, where=None, eager=None):
+
+def countFitsWithShip(lookfor, ownerID=None, where=None, eager=None):
     """
     Get all the fits using a certain ship.
     If no user is passed, do this for all users.
     """
-    if isinstance(shipID, int):
-        if ownerID is not None and not isinstance(ownerID, int):
-            raise TypeError("OwnerID must be integer")
-        filter = Fit.shipID == shipID
-        if ownerID is not None:
-            filter = and_(filter, Fit.ownerID == ownerID)
+    if ownerID is not None and not isinstance(ownerID, int):
+        raise TypeError("OwnerID must be integer")
 
-        filter = processWhere(filter, where)
-        eager = processEager(eager)
-        with sd_lock:
-            count = saveddata_session.query(Fit).options(*eager).filter(filter).count()
+    if isinstance(lookfor, int):
+        filter = Fit.shipID == lookfor
+    elif isinstance(lookfor, list):
+        if len(lookfor) == 0:
+            return 0
+        filter = Fit.shipID.in_(lookfor)
     else:
-        raise TypeError("ShipID must be integer")
+        raise TypeError("You must supply either an integer or ShipID must be integer")
+
+    if ownerID is not None:
+        filter = and_(filter, Fit.ownerID == ownerID)
+
+    filter = processWhere(filter, where)
+    eager = processEager(eager)
+    with sd_lock:
+        count = saveddata_session.query(Fit).options(*eager).filter(filter).count()
+
     return count
 
+
 def getFitList(eager=None):
     eager = processEager(eager)
     with sd_lock:
@@ -308,11 +295,6 @@ def getFitList(eager=None):
 
     return fits
 
-def getFleetList(eager=None):
-    eager = processEager(eager)
-    with sd_lock:
-        fleets = saveddata_session.query(Fleet).options(*eager).all()
-    return fleets
 
 @cachedQuery(Price, 1, "typeID")
 def getPrice(typeID):
@@ -323,12 +305,14 @@ def getPrice(typeID):
         raise TypeError("Need integer as argument")
     return price
 
+
 def clearPrices():
     with sd_lock:
         deleted_rows = saveddata_session.query(Price).delete()
     commit()
     return deleted_rows
 
+
 def getMiscData(field):
     if isinstance(field, basestring):
         with sd_lock:
@@ -337,18 +321,28 @@ def getMiscData(field):
         raise TypeError("Need string as argument")
     return data
 
+
 def getDamagePatternList(eager=None):
     eager = processEager(eager)
     with sd_lock:
         patterns = saveddata_session.query(DamagePattern).options(*eager).all()
     return patterns
 
+
 def getTargetResistsList(eager=None):
     eager = processEager(eager)
     with sd_lock:
         patterns = saveddata_session.query(TargetResists).options(*eager).all()
     return patterns
 
+
+def getImplantSetList(eager=None):
+    eager = processEager(eager)
+    with sd_lock:
+        sets = saveddata_session.query(ImplantSet).options(*eager).all()
+    return sets
+
+
 @cachedQuery(DamagePattern, 1, "lookfor")
 def getDamagePattern(lookfor, eager=None):
     if isinstance(lookfor, int):
@@ -358,15 +352,18 @@ def getDamagePattern(lookfor, eager=None):
         else:
             eager = processEager(eager)
             with sd_lock:
-                pattern = saveddata_session.query(DamagePattern).options(*eager).filter(DamagePattern.ID == lookfor).first()
+                pattern = saveddata_session.query(DamagePattern).options(*eager).filter(
+                    DamagePattern.ID == lookfor).first()
     elif isinstance(lookfor, basestring):
         eager = processEager(eager)
         with sd_lock:
-            pattern = saveddata_session.query(DamagePattern).options(*eager).filter(DamagePattern.name == lookfor).first()
+            pattern = saveddata_session.query(DamagePattern).options(*eager).filter(
+                DamagePattern.name == lookfor).first()
     else:
         raise TypeError("Need integer or string as argument")
     return pattern
 
+
 @cachedQuery(TargetResists, 1, "lookfor")
 def getTargetResists(lookfor, eager=None):
     if isinstance(lookfor, int):
@@ -376,22 +373,45 @@ def getTargetResists(lookfor, eager=None):
         else:
             eager = processEager(eager)
             with sd_lock:
-                pattern = saveddata_session.query(TargetResists).options(*eager).filter(TargetResists.ID == lookfor).first()
+                pattern = saveddata_session.query(TargetResists).options(*eager).filter(
+                    TargetResists.ID == lookfor).first()
     elif isinstance(lookfor, basestring):
         eager = processEager(eager)
         with sd_lock:
-            pattern = saveddata_session.query(TargetResists).options(*eager).filter(TargetResists.name == lookfor).first()
+            pattern = saveddata_session.query(TargetResists).options(*eager).filter(
+                TargetResists.name == lookfor).first()
     else:
         raise TypeError("Need integer or string as argument")
     return pattern
 
+
+@cachedQuery(ImplantSet, 1, "lookfor")
+def getImplantSet(lookfor, eager=None):
+    if isinstance(lookfor, int):
+        if eager is None:
+            with sd_lock:
+                pattern = saveddata_session.query(ImplantSet).get(lookfor)
+        else:
+            eager = processEager(eager)
+            with sd_lock:
+                pattern = saveddata_session.query(ImplantSet).options(*eager).filter(
+                    TargetResists.ID == lookfor).first()
+    elif isinstance(lookfor, basestring):
+        eager = processEager(eager)
+        with sd_lock:
+            pattern = saveddata_session.query(ImplantSet).options(*eager).filter(TargetResists.name == lookfor).first()
+    else:
+        raise TypeError("Improper argument")
+    return pattern
+
+
 def searchFits(nameLike, where=None, eager=None):
     if not isinstance(nameLike, basestring):
         raise TypeError("Need string as argument")
     # Prepare our string for request
     nameLike = u"%{0}%".format(sqlizeString(nameLike))
 
-    #Add any extra components to the search to our where clause
+    # Add any extra components to the search to our where clause
     filter = processWhere(Fit.name.like(nameLike, escape="\\"), where)
     eager = processEager(eager)
     with sd_lock:
@@ -399,14 +419,6 @@ def searchFits(nameLike, where=None, eager=None):
 
     return fits
 
-def getSquadsIDsWithFitID(fitID):
-    if isinstance(fitID, int):
-        with sd_lock:
-            squads = saveddata_session.query(squadmembers_table.c.squadID).filter(squadmembers_table.c.memberID == fitID).all()
-            squads = tuple(entry[0] for entry in squads)
-            return squads
-    else:
-        raise TypeError("Need integer as argument")
 
 def getProjectedFits(fitID):
     if isinstance(fitID, int):
@@ -417,12 +429,14 @@ def getProjectedFits(fitID):
     else:
         raise TypeError("Need integer as argument")
 
+
 def getCrestCharacters(eager=None):
     eager = processEager(eager)
     with sd_lock:
         characters = saveddata_session.query(CrestChar).options(*eager).all()
     return characters
 
+
 @cachedQuery(CrestChar, 1, "lookfor")
 def getCrestCharacter(lookfor, eager=None):
     if isinstance(lookfor, int):
@@ -441,21 +455,25 @@ def getCrestCharacter(lookfor, eager=None):
         raise TypeError("Need integer or string as argument")
     return character
 
+
 def getOverrides(itemID, eager=None):
     if isinstance(itemID, int):
         return saveddata_session.query(Override).filter(Override.itemID == itemID).all()
     else:
         raise TypeError("Need integer as argument")
 
+
 def clearOverrides():
     with sd_lock:
         deleted_rows = saveddata_session.query(Override).delete()
     commit()
     return deleted_rows
 
+
 def getAllOverrides(eager=None):
     return saveddata_session.query(Override).all()
 
+
 def removeInvalid(fits):
     invalids = [f for f in fits if f.isInvalid]
 
@@ -466,14 +484,17 @@ def removeInvalid(fits):
 
     return fits
 
+
 def add(stuff):
     with sd_lock:
         saveddata_session.add(stuff)
 
+
 def save(stuff):
     add(stuff)
     commit()
 
+
 def remove(stuff):
     removeCachedEntry(type(stuff), stuff.ID)
     with sd_lock:

eos/db/saveddata/skill.py

@@ -1,4 +1,4 @@
-#===============================================================================
+# ===============================================================================
 # Copyright (C) 2010 Diego Duclos
 #
 # This file is part of eos.
@@ -15,7 +15,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with eos.  If not, see <http://www.gnu.org/licenses/>.
-#===============================================================================
+# ===============================================================================
 
 from sqlalchemy import Table, Column, Integer, ForeignKey
 from sqlalchemy.orm import mapper
@@ -24,8 +24,8 @@ from eos.db import saveddata_meta
 from eos.types import Skill
 
 skills_table = Table("characterSkills", saveddata_meta,
-                     Column("characterID", ForeignKey("characters.ID"), primary_key = True, index = True),
-                     Column("itemID", Integer, primary_key = True),
-                     Column("_Skill__level", Integer, nullable = True))
+                     Column("characterID", ForeignKey("characters.ID"), primary_key=True, index=True),
+                     Column("itemID", Integer, primary_key=True),
+                     Column("_Skill__level", Integer, nullable=True))
 
 mapper(Skill, skills_table)

eos/db/saveddata/targetResists.py

@@ -1,4 +1,4 @@
-#===============================================================================
+# ===============================================================================
 # Copyright (C) 2014 Ryan Holmes
 #
 # This file is part of eos.
@@ -15,7 +15,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with eos.  If not, see <http://www.gnu.org/licenses/>.
-#===============================================================================
+# ===============================================================================
 
 from sqlalchemy import Table, Column, Integer, Float, ForeignKey, String
 from sqlalchemy.orm import mapper
@@ -24,12 +24,12 @@ from eos.db import saveddata_meta
 from eos.types import TargetResists
 
 targetResists_table = Table("targetResists", saveddata_meta,
-                             Column("ID", Integer, primary_key = True),
-                             Column("name", String),
-                             Column("emAmount", Float),
-                             Column("thermalAmount", Float),
-                             Column("kineticAmount", Float),
-                             Column("explosiveAmount", Float),
-                             Column("ownerID", ForeignKey("users.ID"), nullable=True))
+                            Column("ID", Integer, primary_key=True),
+                            Column("name", String),
+                            Column("emAmount", Float),
+                            Column("thermalAmount", Float),
+                            Column("kineticAmount", Float),
+                            Column("explosiveAmount", Float),
+                            Column("ownerID", ForeignKey("users.ID"), nullable=True))
 
 mapper(TargetResists, targetResists_table)

eos/db/saveddata/user.py

@@ -1,4 +1,4 @@
-#===============================================================================
+# ===============================================================================
 # Copyright (C) 2010 Diego Duclos
 #
 # This file is part of eos.
@@ -15,7 +15,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with eos.  If not, see <http://www.gnu.org/licenses/>.
-#===============================================================================
+# ===============================================================================
 
 from sqlalchemy import Table, Column, Integer, String, Boolean
 from sqlalchemy.orm import mapper
@@ -24,9 +24,9 @@ from eos.db import saveddata_meta
 from eos.types import User
 
 users_table = Table("users", saveddata_meta,
-                         Column("ID", Integer, primary_key = True),
-                         Column("username", String, nullable = False, unique = True),
-                         Column("password", String, nullable = False),
-                         Column("admin", Boolean, nullable = False))
+                    Column("ID", Integer, primary_key=True),
+                    Column("username", String, nullable=False, unique=True),
+                    Column("password", String, nullable=False),
+                    Column("admin", Boolean, nullable=False))
 
 mapper(User, users_table)

eos/db/util.py

@@ -1,4 +1,4 @@
-#===============================================================================
+# ===============================================================================
 # Copyright (C) 2010 Diego Duclos
 #
 # This file is part of eos.
@@ -15,7 +15,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with eos.  If not, see <http://www.gnu.org/licenses/>.
-#===============================================================================
+# ===============================================================================
 
 from sqlalchemy.orm import eagerload
 from sqlalchemy.sql import and_
@@ -31,8 +31,9 @@ replace = {"attributes": "_Item__attributes",
            "damagePattern": "_Fit__damagePattern",
            "projectedFits": "_Fit__projectedFits"}
 
+
 def processEager(eager):
-    if eager == None:
+    if eager is None:
         return tuple()
     else:
         l = []
@@ -44,6 +45,7 @@ def processEager(eager):
 
         return l
 
+
 def _replacements(eagerString):
     splitEager = eagerString.split(".")
     for i in xrange(len(splitEager)):
@@ -54,6 +56,7 @@ def _replacements(eagerString):
 
     return ".".join(splitEager)
 
+
 def processWhere(clause, where):
     if where is not None:
         if not hasattr(where, "__iter__"):

eos/effectHandlerHelpers.py

@@ -1,4 +1,4 @@
-#===============================================================================
+# ===============================================================================
 # Copyright (C) 2010 Diego Duclos
 #
 # This file is part of eos.
@@ -15,15 +15,16 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with eos.  If not, see <http://www.gnu.org/licenses/>.
-#===============================================================================
+# ===============================================================================
 
-#from sqlalchemy.orm.attributes import flag_modified
-import eos.db
-import eos.types
+# from sqlalchemy.orm.attributes import flag_modified
 import logging
 
+import eos.db
+
 logger = logging.getLogger(__name__)
 
+
 class HandledList(list):
     def filteredItemPreAssign(self, filter, *args, **kwargs):
         for element in self:
@@ -108,11 +109,12 @@ class HandledList(list):
     def remove(self, thing):
         # We must flag it as modified, otherwise it not be removed from the database
         # @todo: flag_modified isn't in os x skel. need to rebuild to include
-        #flag_modified(thing, "itemID")
+        # flag_modified(thing, "itemID")
         if thing.isInvalid:  # see GH issue #324
             thing.itemID = 0
         list.remove(self, thing)
 
+
 class HandledModuleList(HandledList):
     def append(self, mod):
         emptyPosition = float("Inf")
@@ -131,14 +133,15 @@ class HandledModuleList(HandledList):
                 self.remove(mod)
             return
 
-        # fix for #529, where a module may be in incorrect state after CCP changes mechanics of module
-        if not mod.isValidState(mod.state):
-            mod.state = eos.types.State.ONLINE
-
         mod.position = len(self)
         HandledList.append(self, mod)
         if mod.isInvalid:
             self.remove(mod)
+            return
+
+        # fix for #529, where a module may be in incorrect state after CCP changes mechanics of module
+        if not mod.isValidState(mod.state):
+            mod.state = eos.types.State.ONLINE
 
     def insert(self, index, mod):
         mod.position = index
@@ -168,10 +171,12 @@ class HandledModuleList(HandledList):
         self[index] = mod
 
     def freeSlot(self, slot):
-        for i in range(len(self) -1, -1, -1):
+        for i in range(len(self)):
             mod = self[i]
             if mod.getModifiedItemAttr("subSystemSlot") == slot:
-                del self[i]
+                self.toDummy(i)
+                break
+
 
 class HandledDroneCargoList(HandledList):
     def find(self, item):
@@ -189,6 +194,7 @@ class HandledDroneCargoList(HandledList):
         if thing.isInvalid:
             self.remove(thing)
 
+
 class HandledImplantBoosterList(HandledList):
     def append(self, thing):
         if thing.isInvalid:
@@ -205,6 +211,7 @@ class HandledImplantBoosterList(HandledList):
 
         HandledList.append(self, thing)
 
+
 class HandledProjectedModList(HandledList):
     def append(self, proj):
         if proj.isInvalid:
@@ -231,6 +238,7 @@ class HandledProjectedModList(HandledList):
         if not proj.item.isType("projected") and not isSystemEffect:
             self.remove(proj)
 
+
 class HandledProjectedDroneList(HandledDroneCargoList):
     def append(self, proj):
         proj.projected = True
@@ -240,6 +248,7 @@ class HandledProjectedDroneList(HandledDroneCargoList):
         if proj.isInvalid or not proj.item.isType("projected"):
             self.remove(proj)
 
+
 class HandledItem(object):
     def preAssignItemAttr(self, *args, **kwargs):
         self.itemModifiedAttributes.preAssign(*args, **kwargs)
@@ -256,6 +265,7 @@ class HandledItem(object):
     def forceItemAttr(self, *args, **kwargs):
         self.itemModifiedAttributes.force(*args, **kwargs)
 
+
 class HandledCharge(object):
     def preAssignChargeAttr(self, *args, **kwargs):
         self.chargeModifiedAttributes.preAssign(*args, **kwargs)

eos/effects/__init__.py

@@ -1,4 +1,4 @@
-#===============================================================================
+# ===============================================================================
 # Copyright (C) 2010 Diego Duclos
 #               2010 Anton Vorobyov
 #
@@ -16,4 +16,4 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with eos.  If not, see <http://www.gnu.org/licenses/>.
-#===============================================================================
+# ===============================================================================

eos/effects/accerationcontrolcapneedbonuspostpercentcapacitorneedlocationshipgroupafterburner.py

@@ -3,6 +3,8 @@
 # Used by:
 # Modules named like: Dynamic Fuel Valve (8 of 8)
 type = "passive"
+
+
 def handler(fit, container, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Propulsion Module",
                                   "capacitorNeed", container.getModifiedItemAttr("capNeedBonus"))

eos/effects/accerationcontrolskillabmwdspeedboost.py

@@ -4,6 +4,8 @@
 # Implant: Zor's Custom Navigation Hyper-Link
 # Skill: Acceleration Control
 type = "passive"
+
+
 def handler(fit, container, context):
     level = container.level if "skill" in context else 1
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Propulsion Module",

eos/effects/accerationcontrolspeedfbonuspostpercentspeedfactorlocationshipgroupafterburner.py

@@ -3,6 +3,8 @@
 # Used by:
 # Implants named like: Eifyr and Co. 'Rogue' Acceleration Control AC (6 of 6)
 type = "passive"
+
+
 def handler(fit, implant, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Propulsion Module",
                                   "speedFactor", implant.getModifiedItemAttr("speedFBonus"))

eos/effects/accessdifficultybonusmodifierrequiringarchaelogy.py

@@ -5,6 +5,8 @@
 # Implant: Poteque 'Prospector' Archaeology AC-905
 # Implant: Poteque 'Prospector' Environmental Analysis EY-1005
 type = "passive"
+
+
 def handler(fit, container, context):
     fit.modules.filteredItemIncrease(lambda module: module.item.requiresSkill("Archaeology"),
                                      "accessDifficultyBonus",

eos/effects/accessdifficultybonusmodifierrequiringhacking.py

@@ -5,7 +5,9 @@
 # Implant: Poteque 'Prospector' Environmental Analysis EY-1005
 # Implant: Poteque 'Prospector' Hacking HC-905
 type = "passive"
+
+
 def handler(fit, container, context):
     fit.modules.filteredItemIncrease(lambda c: c.item.requiresSkill("Hacking"),
-                                  "accessDifficultyBonus",
-                                  container.getModifiedItemAttr("accessDifficultyBonusModifier"), position="post")
+                                     "accessDifficultyBonus",
+                                     container.getModifiedItemAttr("accessDifficultyBonusModifier"), position="post")

eos/effects/adaptivearmorhardener.py

@@ -2,9 +2,120 @@
 #
 # Used by:
 # Module: Reactive Armor Hardener
+import logging
+
+logger = logging.getLogger(__name__)
+
+runTime = "late"
 type = "active"
+
+
 def handler(fit, module, context):
-    for type in ("kinetic", "thermal", "explosive", "em"):
-        attr = "armor%sDamageResonance" % type.capitalize()
-        fit.ship.multiplyItemAttr(attr, module.getModifiedItemAttr(attr),
-                                  stackingPenalties=True, penaltyGroup="preMul")
+    damagePattern = fit.damagePattern
+
+    # Skip if there is no damage pattern. Example: projected ships or fleet boosters
+    if damagePattern:
+        # logger.debug("Damage Pattern: %f/%f/%f/%f", damagePattern.emAmount, damagePattern.thermalAmount, damagePattern.kineticAmount, damagePattern.explosiveAmount)
+        # logger.debug("Original Armor Resists: %f/%f/%f/%f", fit.ship.getModifiedItemAttr('armorEmDamageResonance'), fit.ship.getModifiedItemAttr('armorThermalDamageResonance'), fit.ship.getModifiedItemAttr('armorKineticDamageResonance'), fit.ship.getModifiedItemAttr('armorExplosiveDamageResonance'))
+
+        # Populate a tuple with the damage profile modified by current armor resists.
+        baseDamageTaken = (
+            damagePattern.emAmount * fit.ship.getModifiedItemAttr('armorEmDamageResonance'),
+            damagePattern.thermalAmount * fit.ship.getModifiedItemAttr('armorThermalDamageResonance'),
+            damagePattern.kineticAmount * fit.ship.getModifiedItemAttr('armorKineticDamageResonance'),
+            damagePattern.explosiveAmount * fit.ship.getModifiedItemAttr('armorExplosiveDamageResonance'),
+        )
+        # logger.debug("Damage Adjusted for Armor Resists: %f/%f/%f/%f", baseDamageTaken[0], baseDamageTaken[1], baseDamageTaken[2], baseDamageTaken[3])
+
+        resistanceShiftAmount = module.getModifiedItemAttr(
+            'resistanceShiftAmount') / 100  # The attribute is in percent and we want a fraction
+        RAHResistance = [
+            module.getModifiedItemAttr('armorEmDamageResonance'),
+            module.getModifiedItemAttr('armorThermalDamageResonance'),
+            module.getModifiedItemAttr('armorKineticDamageResonance'),
+            module.getModifiedItemAttr('armorExplosiveDamageResonance'),
+        ]
+
+        # Simulate RAH cycles until the RAH either stops changing or enters a loop.
+        # The number of iterations is limited to prevent an infinite loop if something goes wrong.
+        cycleList = []
+        loopStart = -20
+        for num in range(50):
+            # logger.debug("Starting cycle %d.", num)
+            # The strange order is to emulate the ingame sorting when different types have taken the same amount of damage.
+            # This doesn't take into account stacking penalties. In a few cases fitting a Damage Control causes an inaccurate result.
+            damagePattern_tuples = [
+                (0, baseDamageTaken[0] * RAHResistance[0], RAHResistance[0]),
+                (3, baseDamageTaken[3] * RAHResistance[3], RAHResistance[3]),
+                (2, baseDamageTaken[2] * RAHResistance[2], RAHResistance[2]),
+                (1, baseDamageTaken[1] * RAHResistance[1], RAHResistance[1]),
+            ]
+            # logger.debug("Damage taken this cycle: %f/%f/%f/%f", damagePattern_tuples[0][1], damagePattern_tuples[3][1], damagePattern_tuples[2][1], damagePattern_tuples[1][1])
+
+            # Sort the tuple to drop the highest damage value to the bottom
+            sortedDamagePattern_tuples = sorted(damagePattern_tuples, key=lambda damagePattern: damagePattern[1])
+
+            if sortedDamagePattern_tuples[2][1] == 0:
+                # One damage type: the top damage type takes from the other three
+                # Since the resistances not taking damage will end up going to the type taking damage we just do the whole thing at once.
+                change0 = 1 - sortedDamagePattern_tuples[0][2]
+                change1 = 1 - sortedDamagePattern_tuples[1][2]
+                change2 = 1 - sortedDamagePattern_tuples[2][2]
+                change3 = -(change0 + change1 + change2)
+            elif sortedDamagePattern_tuples[1][1] == 0:
+                # Two damage types: the top two damage types take from the other two
+                # Since the resistances not taking damage will end up going equally to the types taking damage we just do the whole thing at once.
+                change0 = 1 - sortedDamagePattern_tuples[0][2]
+                change1 = 1 - sortedDamagePattern_tuples[1][2]
+                change2 = -(change0 + change1) / 2
+                change3 = -(change0 + change1) / 2
+            else:
+                # Three or four damage types: the top two damage types take from the other two
+                change0 = min(resistanceShiftAmount, 1 - sortedDamagePattern_tuples[0][2])
+                change1 = min(resistanceShiftAmount, 1 - sortedDamagePattern_tuples[1][2])
+                change2 = -(change0 + change1) / 2
+                change3 = -(change0 + change1) / 2
+
+            RAHResistance[sortedDamagePattern_tuples[0][0]] = sortedDamagePattern_tuples[0][2] + change0
+            RAHResistance[sortedDamagePattern_tuples[1][0]] = sortedDamagePattern_tuples[1][2] + change1
+            RAHResistance[sortedDamagePattern_tuples[2][0]] = sortedDamagePattern_tuples[2][2] + change2
+            RAHResistance[sortedDamagePattern_tuples[3][0]] = sortedDamagePattern_tuples[3][2] + change3
+            # logger.debug("Resistances shifted to %f/%f/%f/%f", RAHResistance[0], RAHResistance[1], RAHResistance[2], RAHResistance[3])
+
+            # See if the current RAH profile has been encountered before, indicating a loop.
+            for i, val in enumerate(cycleList):
+                tolerance = 1e-06
+                if abs(RAHResistance[0] - val[0]) <= tolerance and \
+                            abs(RAHResistance[1] - val[1]) <= tolerance and \
+                            abs(RAHResistance[2] - val[2]) <= tolerance and \
+                            abs(RAHResistance[3] - val[3]) <= tolerance:
+                    loopStart = i
+                    # logger.debug("Loop found: %d-%d", loopStart, num)
+                    break
+            if loopStart >= 0:
+                break
+
+            cycleList.append(list(RAHResistance))
+
+        if loopStart < 0:
+            logger.error("Reactive Armor Hardener failed to find equilibrium. Damage profile after armor: %f/%f/%f/%f",
+                         baseDamageTaken[0], baseDamageTaken[1], baseDamageTaken[2], baseDamageTaken[3])
+
+        # Average the profiles in the RAH loop, or the last 20 if it didn't find a loop.
+        loopCycles = cycleList[loopStart:]
+        numCycles = len(loopCycles)
+        average = [0, 0, 0, 0]
+        for cycle in loopCycles:
+            for i in range(4):
+                average[i] += cycle[i]
+
+        for i in range(4):
+            average[i] = round(average[i] / numCycles, 3)
+
+        # Set the new resistances
+        # logger.debug("Setting new resist profile: %f/%f/%f/%f", average[0], average[1], average[2],average[3])
+        for i, attr in enumerate((
+                'armorEmDamageResonance', 'armorThermalDamageResonance', 'armorKineticDamageResonance',
+                'armorExplosiveDamageResonance')):
+            module.increaseItemAttr(attr, average[i] - module.getModifiedItemAttr(attr))
+            fit.ship.multiplyItemAttr(attr, average[i], stackingPenalties=True, penaltyGroup="preMul")

eos/effects/addtosignatureradius2.py

@@ -2,7 +2,9 @@
 #
 # Used by:
 # Modules from group: Missile Launcher Bomb (2 of 2)
-# Modules from group: Shield Extender (25 of 25)
+# Modules from group: Shield Extender (33 of 33)
 type = "passive"
+
+
 def handler(fit, module, context):
-    fit.ship.increaseItemAttr("signatureRadius", module.getModifiedItemAttr("signatureRadiusAdd"))
+    fit.ship.increaseItemAttr("signatureRadius", module.getModifiedItemAttr("signatureRadiusAdd"))

eos/effects/advanceddroneinterfacingmaxgroupdcuskilllevel.py

@@ -1,8 +0,0 @@
-# advancedDroneInterfacingMaxGroupDCUSkillLevel
-#
-# Used by:
-# Skill: Advanced Drone Interfacing
-type = "passive"
-def handler(fit, skill, context):
-    fit.modules.filteredItemIncrease(lambda mod: mod.item.group.name == "Drone Control Unit",
-                                     "maxGroupActive", skill.level)

eos/effects/afterburnerdurationbonuspostpercentdurationlocationshipmodulesrequiringafterburner.py

@@ -5,7 +5,9 @@
 # Implant: Zor's Custom Navigation Link
 # Skill: Afterburner
 type = "passive"
+
+
 def handler(fit, container, context):
     level = container.level if "skill" in context else 1
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Afterburner"),
-                                     "duration", container.getModifiedItemAttr("durationBonus") * level)
+                                  "duration", container.getModifiedItemAttr("durationBonus") * level)

eos/effects/agilitymultipliereffect.py

@@ -5,7 +5,9 @@
 # Modules from group: Nanofiber Internal Structure (7 of 7)
 # Modules from group: Reinforced Bulkhead (8 of 8)
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.ship.boostItemAttr("agility",
                            module.getModifiedItemAttr("agilityMultiplier"),
-                           stackingPenalties = True)
+                           stackingPenalties=True)

eos/effects/agilitymultipliereffectpassive.py

@@ -3,5 +3,7 @@
 # Used by:
 # Modules named like: Polycarbon Engine Housing (8 of 8)
 type = "passive"
+
+
 def handler(fit, module, context):
-    fit.ship.boostItemAttr("agility", module.getModifiedItemAttr("agilityMultiplier"), stackingPenalties = True)
+    fit.ship.boostItemAttr("agility", module.getModifiedItemAttr("agilityMultiplier"), stackingPenalties=True)

eos/effects/ammofallofmultiplier.py

@@ -1,12 +1,14 @@
 # ammoFallofMultiplier
 #
 # Used by:
-# Charges from group: Advanced Artillery Ammo (6 of 6)
-# Charges from group: Advanced Autocannon Ammo (6 of 6)
-# Charges from group: Advanced Beam Laser Crystal (6 of 6)
-# Charges from group: Advanced Blaster Charge (6 of 6)
-# Charges from group: Advanced Pulse Laser Crystal (6 of 6)
-# Charges from group: Advanced Railgun Charge (6 of 6)
+# Charges from group: Advanced Artillery Ammo (8 of 8)
+# Charges from group: Advanced Autocannon Ammo (8 of 8)
+# Charges from group: Advanced Beam Laser Crystal (8 of 8)
+# Charges from group: Advanced Blaster Charge (8 of 8)
+# Charges from group: Advanced Pulse Laser Crystal (8 of 8)
+# Charges from group: Advanced Railgun Charge (8 of 8)
 type = "passive"
+
+
 def handler(fit, module, context):
     module.multiplyItemAttr("falloff", module.getModifiedChargeAttr("fallofMultiplier") or 1)

eos/effects/ammoinfluencecapneed.py

@@ -1,8 +1,12 @@
 # ammoInfluenceCapNeed
 #
 # Used by:
-# Items from category: Charge (458 of 851)
+# Items from category: Charge (465 of 899)
+# Charges from group: Frequency Crystal (185 of 185)
+# Charges from group: Hybrid Charge (209 of 209)
 type = "passive"
+
+
 def handler(fit, module, context):
     # Dirty hack to work around cap charges setting cap booster
     # injection amount to zero

eos/effects/ammoinfluencerange.py

@@ -1,7 +1,9 @@
 # ammoInfluenceRange
 #
 # Used by:
-# Items from category: Charge (559 of 851)
+# Items from category: Charge (571 of 899)
 type = "passive"
+
+
 def handler(fit, module, context):
-    module.multiplyItemAttr("maxRange", module.getModifiedChargeAttr("weaponRangeMultiplier"))
+    module.multiplyItemAttr("maxRange", module.getModifiedChargeAttr("weaponRangeMultiplier"))

eos/effects/ammospeedmultiplier.py

@@ -1,9 +1,11 @@
 # ammoSpeedMultiplier
 #
 # Used by:
-# Charges from group: Festival Charges (8 of 8)
+# Charges from group: Festival Charges (9 of 9)
 # Charges from group: Interdiction Probe (2 of 2)
 # Charges from group: Survey Probe (3 of 3)
 type = "passive"
+
+
 def handler(fit, module, context):
     module.multiplyItemAttr("speed", module.getModifiedChargeAttr("speedMultiplier") or 1)

eos/effects/ammotrackingmultiplier.py

@@ -1,13 +1,15 @@
 # ammoTrackingMultiplier
 #
 # Used by:
-# Charges from group: Advanced Artillery Ammo (6 of 6)
-# Charges from group: Advanced Autocannon Ammo (6 of 6)
-# Charges from group: Advanced Beam Laser Crystal (6 of 6)
-# Charges from group: Advanced Blaster Charge (6 of 6)
-# Charges from group: Advanced Pulse Laser Crystal (6 of 6)
-# Charges from group: Advanced Railgun Charge (6 of 6)
+# Charges from group: Advanced Artillery Ammo (8 of 8)
+# Charges from group: Advanced Autocannon Ammo (8 of 8)
+# Charges from group: Advanced Beam Laser Crystal (8 of 8)
+# Charges from group: Advanced Blaster Charge (8 of 8)
+# Charges from group: Advanced Pulse Laser Crystal (8 of 8)
+# Charges from group: Advanced Railgun Charge (8 of 8)
 # Charges from group: Projectile Ammo (129 of 129)
 type = "passive"
+
+
 def handler(fit, module, context):
-    module.multiplyItemAttr("trackingSpeed", module.getModifiedChargeAttr("trackingSpeedMultiplier"))
+    module.multiplyItemAttr("trackingSpeed", module.getModifiedChargeAttr("trackingSpeedMultiplier"))

eos/effects/angelsetbonus.py

@@ -4,8 +4,11 @@
 # Implants named like: grade Halo (18 of 18)
 runTime = "early"
 type = "passive"
+
+
 def handler(fit, implant, context):
-    fit.implants.filteredItemMultiply(
-        lambda implant: "signatureRadiusBonus" in implant.itemModifiedAttributes and "implantSetAngel" in implant.itemModifiedAttributes,
+    fit.appliedImplants.filteredItemMultiply(
+        lambda implant: "signatureRadiusBonus" in implant.itemModifiedAttributes and
+                        "implantSetAngel" in implant.itemModifiedAttributes,
         "signatureRadiusBonus",
-        implant.getModifiedItemAttr("implantSetAngel"))
+        implant.getModifiedItemAttr("implantSetAngel"))

eos/effects/antiwarpscramblingpassive.py

@@ -3,5 +3,7 @@
 # Used by:
 # Modules from group: Warp Core Stabilizer (8 of 8)
 type = "passive"
+
+
 def handler(fit, module, context):
-    fit.ship.increaseItemAttr("warmScrambleStatus", module.getModifiedItemAttr("warpScrambleStrength"))
+    fit.ship.increaseItemAttr("warmScrambleStatus", module.getModifiedItemAttr("warpScrambleStrength"))

eos/effects/archaeologyskillvirusbonus.py

@@ -6,6 +6,8 @@
 # Implant: Poteque 'Prospector' Environmental Analysis EY-1005
 # Skill: Archaeology
 type = "passive"
+
+
 def handler(fit, container, context):
     level = container.level if "skill" in context else 1
     fit.modules.filteredItemIncrease(lambda mod: mod.item.requiresSkill("Archaeology"),

eos/effects/armorallrepairsystemsamountbonuspassive.py

@@ -4,6 +4,9 @@
 # Implants named like: Exile Booster (4 of 4)
 # Implant: Antipharmakon Kosybo
 type = "passive"
+
+
 def handler(fit, booster, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Repair Systems") or mod.item.requiresSkill("Capital Repair Systems"),
-                                  "armorDamageAmount", booster.getModifiedItemAttr("armorDamageAmountBonus"))
+    fit.modules.filteredItemBoost(
+        lambda mod: mod.item.requiresSkill("Repair Systems") or mod.item.requiresSkill("Capital Repair Systems"),
+        "armorDamageAmount", booster.getModifiedItemAttr("armorDamageAmountBonus"))

eos/effects/armordamageamountbonuscapitalarmorrepairers.py

@@ -3,6 +3,8 @@
 # Used by:
 # Modules named like: Auxiliary Nano Pump (8 of 8)
 type = "passive"
+
+
 def handler(fit, implant, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Repair Systems"),
                                   "armorDamageAmount", implant.getModifiedItemAttr("repairBonus"),

eos/effects/armoredcommanddurationbonus.py

@@ -0,0 +1,11 @@
+# armoredCommandDurationBonus
+#
+# Used by:
+# Skill: Armored Command
+type = "passive"
+
+
+def handler(fit, src, context):
+    lvl = src.level
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Command"), "buffDuration",
+                                  src.getModifiedItemAttr("durationBonus") * lvl)

eos/effects/armoredcommandmindlink.py

@@ -0,0 +1,20 @@
+# armoredCommandMindlink
+#
+# Used by:
+# Implant: Armored Command Mindlink
+# Implant: Federation Navy Command Mindlink
+# Implant: Imperial Navy Command Mindlink
+type = "passive"
+
+
+def handler(fit, src, context):
+    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Armored Command"), "warfareBuff2Multiplier",
+                                    src.getModifiedItemAttr("mindlinkBonus"))
+    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Armored Command"), "warfareBuff1Multiplier",
+                                    src.getModifiedItemAttr("mindlinkBonus"))
+    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Armored Command"), "warfareBuff4Multiplier",
+                                    src.getModifiedItemAttr("mindlinkBonus"))
+    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Armored Command"), "warfareBuff3Multiplier",
+                                    src.getModifiedItemAttr("mindlinkBonus"))
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Command"), "buffDuration",
+                                  src.getModifiedItemAttr("mindlinkBonus"))

eos/effects/armoredcommandstrengthbonus.py

@@ -0,0 +1,17 @@
+# armoredCommandStrengthBonus
+#
+# Used by:
+# Skill: Armored Command Specialist
+type = "passive"
+
+
+def handler(fit, src, context):
+    lvl = src.level
+    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Armored Command"), "warfareBuff1Multiplier",
+                                    src.getModifiedItemAttr("commandStrengthBonus") * lvl)
+    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Armored Command"), "warfareBuff2Multiplier",
+                                    src.getModifiedItemAttr("commandStrengthBonus") * lvl)
+    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Armored Command"), "warfareBuff4Multiplier",
+                                    src.getModifiedItemAttr("commandStrengthBonus") * lvl)
+    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Armored Command"), "warfareBuff3Multiplier",
+                                    src.getModifiedItemAttr("commandStrengthBonus") * lvl)

eos/effects/armoredsquadroncommand.py

@@ -1,9 +0,0 @@
-# armoredSquadronCommand
-#
-# Used by:
-# Skill: Armored Warfare Specialist
-runTime = "early"
-type = "passive"
-def handler(fit, skill, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Warfare Specialist"),
-                                  "commandBonus", skill.getModifiedItemAttr("squadronCommandBonus") * skill.level)

eos/effects/armoredwarfaremindlink.py

@@ -1,10 +0,0 @@
-# armoredWarfareMindlink
-#
-# Used by:
-# Implant: Armored Warfare Mindlink
-# Implant: Federation Navy Warfare Mindlink
-# Implant: Imperial Navy Warfare Mindlink
-type = "passive"
-def handler(fit, implant, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Warfare Specialist"),
-                                  "commandBonus", implant.getModifiedItemAttr("mindlinkBonus"))

eos/effects/armorhpbonusadd.py

@@ -1,7 +1,9 @@
 # armorHPBonusAdd
 #
 # Used by:
-# Modules from group: Armor Reinforcer (41 of 41)
+# Modules from group: Armor Reinforcer (48 of 48)
 type = "passive"
+
+
 def handler(fit, module, context):
-    fit.ship.increaseItemAttr("armorHP", module.getModifiedItemAttr("armorHPBonusAdd"))
+    fit.ship.increaseItemAttr("armorHP", module.getModifiedItemAttr("armorHPBonusAdd"))

eos/effects/armorhpbonusaddpassive.py

@@ -3,5 +3,7 @@
 # Used by:
 # Subsystems from group: Defensive Systems (16 of 16)
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.ship.increaseItemAttr("armorHP", module.getModifiedItemAttr("armorHPBonusAdd"))

eos/effects/armorhpmultiply.py

@@ -5,5 +5,7 @@
 # Modules from group: Armor Plating Energized (187 of 187)
 # Modules named like: QA Multiship Module Players (4 of 4)
 type = "passive"
+
+
 def handler(fit, module, context):
-    fit.ship.multiplyItemAttr("armorHP", module.getModifiedItemAttr("armorHPMultiplier"))
+    fit.ship.multiplyItemAttr("armorHP", module.getModifiedItemAttr("armorHPMultiplier"))