Add a message box informing user of failed ESI initialization

Improve user experience customizing jargon.yaml

.appveyor.yml

@@ -0,0 +1,186 @@
+environment:
+
+  global:
+    # SDK v7.0 MSVC Express 2008's SetEnv.cmd script will fail if the
+    # /E:ON and /V:ON options are not enabled in the batch script intepreter
+    # See: http://stackoverflow.com/a/13751649/163740
+    CMD_IN_ENV: "cmd /E:ON /V:ON /C .\\appveyor\\run_with_env.cmd"
+
+  matrix:
+
+    # Python 2.7.10 is the latest version and is not pre-installed.
+
+    - PYTHON: "C:\\Python27.10"
+      PYTHON_VERSION: "2.7.10"
+      PYTHON_ARCH: "32"
+
+    #- PYTHON: "C:\\Python27.10-x64"
+    #  PYTHON_VERSION: "2.7.10"
+    #  PYTHON_ARCH: "64"
+
+    # Pre-installed Python versions, which Appveyor may upgrade to
+    # a later point release.
+    # See: http://www.appveyor.com/docs/installed-software#python
+
+    #- PYTHON: "C:\\Python27"
+    #  PYTHON_VERSION: "2.7.x" # currently 2.7.9
+    #  PYTHON_ARCH: "32"
+
+    #- PYTHON: "C:\\Python27-x64"
+    #  PYTHON_VERSION: "2.7.x" # currently 2.7.9
+    #  PYTHON_ARCH: "64"
+
+    #- PYTHON: "C:\\Python33"
+    #  PYTHON_VERSION: "3.3.x" # currently 3.3.5
+    #  PYTHON_ARCH: "32"
+
+    #- PYTHON: "C:\\Python33-x64"
+    #  PYTHON_VERSION: "3.3.x" # currently 3.3.5
+    #  PYTHON_ARCH: "64"
+
+    #- PYTHON: "C:\\Python34"
+    #  PYTHON_VERSION: "3.4.x" # currently 3.4.3
+    #  PYTHON_ARCH: "32"
+
+    #- PYTHON: "C:\\Python34-x64"
+    #  PYTHON_VERSION: "3.4.x" # currently 3.4.3
+    #  PYTHON_ARCH: "64"
+
+    # Python versions not pre-installed
+
+    # Python 2.6.6 is the latest Python 2.6 with a Windows installer
+    # See: https://github.com/ogrisel/python-appveyor-demo/issues/10
+
+    #- PYTHON: "C:\\Python266"
+    #  PYTHON_VERSION: "2.6.6"
+    #  PYTHON_ARCH: "32"
+
+    #- PYTHON: "C:\\Python266-x64"
+    #  PYTHON_VERSION: "2.6.6"
+    #  PYTHON_ARCH: "64"
+
+    #- PYTHON: "C:\\Python35"
+    #  PYTHON_VERSION: "3.5.0"
+    #  PYTHON_ARCH: "32"
+
+    #- PYTHON: "C:\\Python35-x64"
+    #  PYTHON_VERSION: "3.5.0"
+    #  PYTHON_ARCH: "64"
+
+    # Major and minor releases (i.e x.0.0 and x.y.0) prior to 3.3.0 use
+    # a different naming scheme.
+
+    #- PYTHON: "C:\\Python270"
+    #  PYTHON_VERSION: "2.7.0"
+    #  PYTHON_ARCH: "32"
+
+    #- PYTHON: "C:\\Python270-x64"
+    #  PYTHON_VERSION: "2.7.0"
+    #  PYTHON_ARCH: "64"
+
+install:
+  # If there is a newer build queued for the same PR, cancel this one.
+  # The AppVeyor 'rollout builds' option is supposed to serve the same
+  # purpose but it is problematic because it tends to cancel builds pushed
+  # directly to master instead of just PR builds (or the converse).
+  # credits: JuliaLang developers.
+  - ps: if ($env:APPVEYOR_PULL_REQUEST_NUMBER -and $env:APPVEYOR_BUILD_NUMBER -ne ((Invoke-RestMethod `
+        https://ci.appveyor.com/api/projects/$env:APPVEYOR_ACCOUNT_NAME/$env:APPVEYOR_PROJECT_SLUG/history?recordsNumber=50).builds | `
+        Where-Object pullRequestId -eq $env:APPVEYOR_PULL_REQUEST_NUMBER)[0].buildNumber) { `
+          throw "There are newer queued builds for this pull request, failing early." }
+
+  # Install wxPython
+  - 'ECHO Downloading wxPython.'
+  - "appveyor DownloadFile https://goo.gl/yvO8PB -FileName C:\\wxpython.exe"
+  #- "appveyor DownloadFile https://goo.gl/Uj0jV3 -FileName C:\\wxpython64.exe"
+
+  - 'ECHO Install wxPython'
+  - "C:\\wxpython.exe /SP- /VERYSILENT /NORESTART"
+  #- "C:\\wxpython64.exe /SP- /VERYSILENT /NORESTART"
+
+  - ECHO "Filesystem root:"
+  - ps: "ls \"C:/\""
+
+  - ECHO "Filesystem pyfa root:"
+  - ps: "ls \"C:\\projects\\pyfa\\\""
+
+  - ECHO "Installed SDKs:"
+  - ps: "ls \"C:/Program Files/Microsoft SDKs/Windows\""
+
+  # Install Python (from the official .msi of http://python.org) and pip when
+  # not already installed.
+  # - ps: if (-not(Test-Path($env:PYTHON))) { & appveyor\install.ps1 }
+
+  # Prepend newly installed Python to the PATH of this build (this cannot be
+  # done from inside the powershell script as it would require to restart
+  # the parent CMD process).
+  - "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%"
+
+  # Check that we have the expected version and architecture for Python
+  - "python --version"
+  - "python -c \"import struct; print(struct.calcsize('P') * 8)\""
+
+  # Upgrade to the latest version of pip to avoid it displaying warnings
+  # about it being out of date.
+  - "pip install --disable-pip-version-check --user --upgrade pip"
+
+  # Install the build dependencies of the project. If some dependencies contain
+  # compiled extensions and are not provided as pre-built wheel packages,
+  # pip will build them from source using the MSVC compiler matching the
+  # target Python version and architecture
+  # C:\\projects\\eve-gnosis\\
+  - ECHO "Install pip requirements:"
+  - "pip install -r requirements.txt"
+  - "pip install -r requirements_test.txt"
+  - "pip install -r requirements_build_windows.txt"
+
+build_script:
+  # Build the compiled extension
+  # - "python setup.py build"
+  - ECHO "Build pyfa:"
+  #- copy C:\projects\pyfa\dist_assets\win\pyfa.spec C:\projects\pyfa\pyfa.spec
+  - "python C:\\projects\\pyfa\\setup.py build"
+
+  #- ECHO "Build pyfa (Debug):"
+  #- copy C:\projects\pyfa\dist_assets\win\pyfa_debug.spec C:\projects\pyfa\pyfa_debug.spec
+  #- "pyinstaller.exe --clean --noconfirm --windowed --upx-dir=C:\\projects\\pyfa\\scripts\\upx.exe C:\\projects\\pyfa\\pyfa_debug.spec"
+
+build: on
+
+after_build:
+  - ps: "ls \"./\""
+  #- ps: "ls \"C:\\projects\\pyfa\\build\\pyfa\\\""
+  - ps: "ls \"C:\\projects\\pyfa\\build\\\""
+  - ps: "ls \"C:\\projects\\pyfa\\build\\exe.win32-2.7\\\""
+  # Zip
+  # APPVEYOR_PULL_REQUEST_NUMBER -and $env:APPVEYOR_BUILD_NUMBER
+  #- 7z a build.zip -r C:\projects\pyfa\build\pyfa\*.*
+  - 7z a pyfa.zip -r C:\projects\pyfa\build\exe.win32-2.7\*.*
+  #- 7z a pyfa_debug.zip -r C:\projects\pyfa\dist\pyfa_debug\*.*
+
+on_success:
+  # Do nothing right now
+
+test_script:
+  #- tox
+  #- "py.test --cov=./"
+  # Run the project tests
+  # - "%CMD_IN_ENV% python C:/projects/eve-gnosis/setup.py nosetests"
+
+after_test:
+  # If tests are successful, create binary packages for the project.
+  # - "%CMD_IN_ENV% python setup.py bdist_wheel"
+  # - "%CMD_IN_ENV% python setup.py bdist_wininst"
+  # - "%CMD_IN_ENV% python setup.py bdist_msi"
+  # - ps: "ls dist"
+
+artifacts:
+  # Archive the generated packages in the ci.appveyor.com build report.
+  - path: pyfa.zip
+    name: 'pyfa.zip'
+  #- path: pyfa_debug.zip
+  #  name: Pyfa_debug
+
+#on_success:
+#  - TODO: upload the content of dist/*.whl to a public wheelhouse
+#

.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
+pyfa.py     text eol=lf
+
+# 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,121 @@
 #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
+
+# 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
+gitversion
+.version
+/.version
+*.swp
+

.mailmap

@@ -0,0 +1,14 @@
+cncfanatics <diego.duclos@gmail.com> cncfanatics <cncfanatics@titanium.(none)>
+blitzmann <holmes.ryan.90@gmail.com>
+blitzmann <holmes.ryan.90@gmail.com> blitzmann <ryan.xgamer99@gmail.com>
+blitzmann <holmes.ryan.90@gmail.com>
+blitzmann <holmes.ryan.90@gmail.com> blitzman <ryan.xgamer99@gmail.com>
+blitzmann <holmes.ryan.90@gmail.com> Ryan Holmes <ryan.holmes.90@gmail.com>
+blitzmann <holmes.ryan.90@gmail.com>
+Corollax <corollax@gmail.com> Corollax <corollax@corollax-laptop.(none)>
+Corollax <corollax@gmail.com> Corollax <corollax@corollax-N76VM.(none)>
+Mr. Nukealizer <mr.nukealizer@gmail.com> Mr. Nukealizer <MrNukealizer@users.noreply.github.com>
+DarkPhoenix <phoenix@mail.ru>
+Sakari Orisi <sakari@evefit.org>
+Will Wykeham <will@wykeham.net> Will Wykeham <will.wykeham@paconsulting.com>
+OISumeko <camerongrout@gmail.com> OISumeko <cameron@sporadic.co.nz>

.travis.yml

@@ -0,0 +1,39 @@
+language: python
+cache: pip
+python:
+  - '2.7'
+env:
+  - TOXENV=pep8
+addons:
+  apt:
+    packages:
+before_install:
+  - sudo apt-get update && sudo apt-get --reinstall install -qq language-pack-en language-pack-ru language-pack-he language-pack-zh-hans
+  - pip install tox
+  # We're not actually installing Tox, but have to run it before we install wxPython via Conda. This is fugly but vOv
+  - tox
+  # get Conda
+  - if [[ "$TRAVIS_PYTHON_VERSION" == "2.7" ]]; then
+      wget https://repo.continuum.io/miniconda/Miniconda-latest-Linux-x86_64.sh -O miniconda.sh;
+    else
+      wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh;
+    fi
+  - bash miniconda.sh -b -p $HOME/miniconda
+  - export PATH="$HOME/miniconda/bin:$PATH"
+  - hash -r
+  - conda config --set always_yes yes --set changeps1 no
+  - conda update -q conda
+  # Useful for debugging any issues with conda
+  - conda info -a
+install:
+  # install wxPython 3.0.0.0
+  - conda install -c https://conda.anaconda.org/travis wxpython
+before_script:
+  - pip install -r requirements.txt
+  - pip install -r requirements_test.txt
+script:
+  - py.test --cov=./
+after_success:
+  - bash <(curl -s https://codecov.io/bash)
+before_deploy:
+  - pip install -r requirements_build_linux.txt

ISSUE_TEMPLATE.md

@@ -0,0 +1,34 @@
+<!--
+
+Submit a bug report bug report or feature request
+
+Here you can inform pyfa developers of potential bugs or suggest features / improvements to the project. Please check
+to make sure that the bug hasn't been reported or feature requested before submitting. If you have general questions
+about the project and want to reach out to the developers personally, please check out out our [Slack]
+(https://pyfainvite.azurewebsites.net/).
+
+-->
+
+## Bug Report
+
+
+### Expected behavior:
+
+
+### Actual behavior:
+
+
+### Detailed steps to reproduce:
+
+
+### Fits involved in EFT format (Edit > To Clipboard > EFT):
+
+
+### Release or development git branch? Please note the release version or commit hash:
+
+
+### Operating system and version (eg: Windows 10, OS X 10.9, OS X 10.11, Ubuntu 16.10):
+
+
+### Other relevant information:
+

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/) [![Build Status](https://travis-ci.org/pyfa-org/Pyfa.svg?branch=master)](https://travis-ci.org/pyfa-org/Pyfa)
 
 ![pyfa](https://cloud.githubusercontent.com/assets/3904767/10271512/af385ef2-6ade-11e5-8f67-52b8b1e4c797.PNG)
 
@@ -9,50 +9,50 @@
 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
+## Installation
-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.
+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
+#### OS X
-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
+Apart from the official release, 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:
-* `wxPython` 2.8/3.0
+```
-* `sqlalchemy` >= 0.6
+$ brew install Caskroom/cask/pyfa
-* `dateutil`
+```
-* `matplotlib` (for some Linux distributions, you may need to install separate wxPython bindings, such as `python-matplotlib-wx`)
-* `requests`
 
 ### 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 3.6
+* Requirements as listed in `requirements.txt`
 
 ## 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](https://forums.eveonline.com/t/27156)
-* [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.

_development/Pyfa_CodeStyle.xml

@@ -0,0 +1,13 @@
+<code_scheme name="Pyfa">
+  <option name="LINE_SEPARATOR" value="&#xD;&#xA;" />
+  <option name="RIGHT_MARGIN" value="165" />
+  <Python>
+    <option name="NEW_LINE_AFTER_COLON" value="true" />
+    <option name="DICT_ALIGNMENT" value="2" />
+    <option name="DICT_NEW_LINE_AFTER_LEFT_BRACE" value="true" />
+    <option name="DICT_NEW_LINE_BEFORE_RIGHT_BRACE" value="true" />
+    <option name="USE_CONTINUATION_INDENT_FOR_ARGUMENTS" value="true" />
+    <option name="OPTIMIZE_IMPORTS_SORT_NAMES_IN_FROM_IMPORTS" value="true" />
+    <option name="OPTIMIZE_IMPORTS_JOIN_FROM_IMPORTS_WITH_SAME_SOURCE" value="true" />
+  </Python>
+</code_scheme>

_development/Pyfa_Inspections.xml

@@ -0,0 +1,54 @@
+<profile version="1.0">
+  <option name="myName" value="Pyfa" />
+  <inspection_tool class="IgnoreUnusedEntry" enabled="false" level="UNUSED ENTRY" enabled_by_default="false" />
+  <inspection_tool class="InconsistentLineSeparators" enabled="true" level="ERROR" enabled_by_default="true" />
+  <inspection_tool class="ProblematicWhitespace" enabled="true" level="WARNING" enabled_by_default="true" />
+  <inspection_tool class="PyBehaveInspection" enabled="true" level="WARNING" enabled_by_default="true" />
+  <inspection_tool class="PyClassicStyleClassInspection" enabled="true" level="WARNING" enabled_by_default="true" />
+  <inspection_tool class="PyCompatibilityInspection" enabled="true" level="WARNING" enabled_by_default="true">
+    <option name="ourVersions">
+      <value>
+        <list size="1">
+          <item index="0" class="java.lang.String" itemvalue="2.7" />
+        </list>
+      </value>
+    </option>
+  </inspection_tool>
+  <inspection_tool class="PyMissingTypeHintsInspection" enabled="true" level="WEAK WARNING" enabled_by_default="true" />
+  <inspection_tool class="PyPackageRequirementsInspection" enabled="true" level="WARNING" enabled_by_default="true">
+    <option name="ignoredPackages">
+      <value>
+        <list size="1">
+          <item index="0" class="java.lang.String" itemvalue="wxPython" />
+        </list>
+      </value>
+    </option>
+  </inspection_tool>
+  <inspection_tool class="PyPep8Inspection" enabled="true" level="TYPO" enabled_by_default="true">
+    <option name="ignoredErrors">
+      <list>
+        <option value="E203" />
+        <option value="E127" />
+        <option value="E128" />
+        <option value="E126" />
+      </list>
+    </option>
+  </inspection_tool>
+  <inspection_tool class="PyPep8NamingInspection" enabled="true" level="TYPO" enabled_by_default="true">
+    <option name="ignoredErrors">
+      <list>
+        <option value="N802" />
+        <option value="N806" />
+        <option value="N803" />
+        <option value="N814" />
+      </list>
+    </option>
+  </inspection_tool>
+  <inspection_tool class="PyShadowingBuiltinsInspection" enabled="true" level="WARNING" enabled_by_default="true" />
+  <inspection_tool class="PyShadowingNamesInspection" enabled="true" level="WARNING" enabled_by_default="true" />
+  <inspection_tool class="SpellCheckingInspection" enabled="false" level="TYPO" enabled_by_default="false">
+    <option name="processCode" value="true" />
+    <option name="processLiterals" value="true" />
+    <option name="processComments" value="true" />
+  </inspection_tool>
+</profile>

_development/helpers.py

@@ -0,0 +1,145 @@
+# noinspection PyPackageRequirements
+import pytest
+
+import os
+import sys
+import threading
+
+from sqlalchemy import MetaData, create_engine
+from sqlalchemy.orm import sessionmaker
+
+script_dir = os.path.dirname(os.path.abspath(__file__))
+# Add root folder to python paths
+sys.path.append(os.path.realpath(os.path.join(script_dir, '..', '..')))
+sys._called_from_test = True
+
+# noinspection PyUnresolvedReferences,PyUnusedLocal
+@pytest.fixture
+def DBInMemory_test():
+    def rollback():
+        with sd_lock:
+            saveddata_session.rollback()
+
+
+    print("Creating database in memory")
+    from os.path import realpath, join, dirname, abspath
+
+    debug = False
+    gamedataCache = True
+    saveddataCache = True
+    gamedata_version = ""
+    gamedata_connectionstring = 'sqlite:///' + realpath(join(dirname(abspath(str(__file__))), "..", "eve.db"))
+    saveddata_connectionstring = 'sqlite:///:memory:'
+
+    class ReadOnlyException(Exception):
+        pass
+
+    if callable(gamedata_connectionstring):
+        gamedata_engine = create_engine("sqlite://", creator=gamedata_connectionstring, echo=debug)
+    else:
+        gamedata_engine = create_engine(gamedata_connectionstring, echo=debug)
+
+    gamedata_meta = MetaData()
+    gamedata_meta.bind = gamedata_engine
+    gamedata_session = sessionmaker(bind=gamedata_engine, autoflush=False, expire_on_commit=False)()
+
+    # This should be moved elsewhere, maybe as an actual query. Current, without try-except, it breaks when making a new
+    # game db because we haven't reached gamedata_meta.create_all()
+    try:
+        gamedata_version = gamedata_session.execute(
+            "SELECT `field_value` FROM `metadata` WHERE `field_name` LIKE 'client_build'"
+        ).fetchone()[0]
+    except Exception as e:
+        print("Missing gamedata version.")
+        gamedata_version = None
+
+    if saveddata_connectionstring is not None:
+        if callable(saveddata_connectionstring):
+            saveddata_engine = create_engine(creator=saveddata_connectionstring, echo=debug)
+        else:
+            saveddata_engine = create_engine(saveddata_connectionstring, echo=debug)
+
+        saveddata_meta = MetaData()
+        saveddata_meta.bind = saveddata_engine
+        saveddata_session = sessionmaker(bind=saveddata_engine, autoflush=False, expire_on_commit=False)()
+    else:
+        saveddata_meta = None
+
+    # Lock controlling any changes introduced to session
+    sd_lock = threading.Lock()
+
+    # Import all the definitions for all our database stuff
+    # noinspection PyPep8
+    #from eos.db.gamedata import alphaClones, attribute, category, effect, group, icon, item, marketGroup, metaData, metaGroup, queries, traits, unit
+    # noinspection PyPep8
+    #from eos.db.saveddata import booster, cargo, character, crest, damagePattern, databaseRepair, drone, fighter, fit, implant, implantSet, loadDefaultDatabaseValues, miscData, module, override, price, queries, skill, targetResists, user
+
+    # If using in memory saveddata, you'll want to reflect it so the data structure is good.
+    if saveddata_connectionstring == "sqlite:///:memory:":
+        saveddata_meta.create_all()
+
+    # Output debug info to help us troubleshoot Travis
+    print(saveddata_engine)
+    print(gamedata_engine)
+
+    helper = {
+        #'config': eos.config,
+        'gamedata_session'    : gamedata_session,
+        'saveddata_session'    : saveddata_session,
+    }
+    return helper
+
+# noinspection PyUnresolvedReferences,PyUnusedLocal
+@pytest.fixture
+def DBInMemory():
+    print("Creating database in memory")
+
+    import eos.config
+
+    import eos
+    import eos.db
+
+    # Output debug info to help us troubleshoot Travis
+    print((eos.db.saveddata_engine))
+    print((eos.db.gamedata_engine))
+
+    helper = {
+        'config': eos.config,
+        'db'    : eos.db,
+        'gamedata_session' : eos.db.gamedata_session,
+        'saveddata_session' : eos.db.saveddata_session,
+    }
+    return helper
+
+
+@pytest.fixture
+def Gamedata():
+    print("Building Gamedata")
+    from eos.gamedata import Item
+
+    helper = {
+        'Item': Item,
+    }
+    return helper
+
+
+@pytest.fixture
+def Saveddata():
+    print("Building Saveddata")
+    from eos.saveddata.ship import Ship
+    from eos.saveddata.fit import Fit
+    from eos.saveddata.character import Character
+    from eos.saveddata.module import Module, State
+    from eos.saveddata.citadel import Citadel
+    from eos.saveddata.booster import Booster
+
+    helper = {
+        'Structure': Citadel,
+        'Ship'     : Ship,
+        'Fit'      : Fit,
+        'Character': Character,
+        'Module'   : Module,
+        'State'    : State,
+        'Booster'  : Booster,
+    }
+    return helper

_development/helpers_fits.py

@@ -0,0 +1,66 @@
+import pytest
+
+# noinspection PyPackageRequirements
+from _development.helpers import DBInMemory as DB, Gamedata, Saveddata
+
+
+# noinspection PyShadowingNames
+@pytest.fixture
+def RifterFit(DB, Gamedata, Saveddata):
+    print("Creating Rifter")
+    item = DB['gamedata_session'].query(Gamedata['Item']).filter(Gamedata['Item'].name == "Rifter").first()
+    ship = Saveddata['Ship'](item)
+    # setup fit
+    fit = Saveddata['Fit'](ship, "My Rifter Fit")
+
+    return fit
+
+
+# noinspection PyShadowingNames
+@pytest.fixture
+def KeepstarFit(DB, Gamedata, Saveddata):
+    print("Creating Keepstar")
+    item = DB['gamedata_session'].query(Gamedata['Item']).filter(Gamedata['Item'].name == "Keepstar").first()
+    ship = Saveddata['Structure'](item)
+    # setup fit
+    fit = Saveddata['Fit'](ship, "Keepstar Fit")
+
+    return fit
+
+
+# noinspection PyShadowingNames
+@pytest.fixture
+def CurseFit(DB, Gamedata, Saveddata):
+    print("Creating Curse - With Neuts")
+    item = DB['gamedata_session'].query(Gamedata['Item']).filter(Gamedata['Item'].name == "Curse").first()
+    ship = Saveddata['Ship'](item)
+    # setup fit
+    fit = Saveddata['Fit'](ship, "Curse - With Neuts")
+
+    mod = Saveddata['Module'](DB['db'].getItem("Medium Energy Neutralizer II"))
+    mod.state = Saveddata['State'].ONLINE
+
+    # Add 5 neuts
+    for _ in range(5):
+        fit.modules.append(mod)
+
+    return fit
+
+
+# noinspection PyShadowingNames
+@pytest.fixture
+def HeronFit(DB, Gamedata, Saveddata):
+    print("Creating Heron - RemoteSebo")
+    item = DB['gamedata_session'].query(Gamedata['Item']).filter(Gamedata['Item'].name == "Heron").first()
+    ship = Saveddata['Ship'](item)
+    # setup fit
+    fit = Saveddata['Fit'](ship, "Heron - RemoteSebo")
+
+    mod = Saveddata['Module'](DB['db'].getItem("Remote Sensor Booster II"))
+    mod.state = Saveddata['State'].ONLINE
+
+    # Add 5 neuts
+    for _ in range(4):
+        fit.modules.append(mod)
+
+    return fit

_development/helpers_items.py

@@ -0,0 +1,12 @@
+import pytest
+
+# noinspection PyPackageRequirements
+from _development.helpers import DBInMemory as DB, Gamedata, Saveddata
+
+
+# noinspection PyShadowingNames
+@pytest.fixture
+def StrongBluePillBooster (DB, Gamedata, Saveddata):
+    print("Creating Strong Blue Pill Booster")
+    item = DB['gamedata_session'].query(Gamedata['Item']).filter(Gamedata['Item'].name == "Strong Blue Pill Booster").first()
+    return Saveddata['Booster'](item)

_development/helpers_locale.py

@@ -0,0 +1,101 @@
+import os
+
+# https://msdn.microsoft.com/en-us/library/windows/desktop/dd317756(v=vs.85).aspx
+windows_codecs = {
+    'cp1252',  # Standard Windows
+    'cp1251',  # Russian
+    'cp037',
+    'cp424',
+    'cp437',
+    'cp500',
+    'cp720',
+    'cp737',
+    'cp775',
+    'cp850',
+    'cp852',
+    'cp855',
+    'cp856',
+    'cp857',
+    'cp858',
+    'cp860',
+    'cp861',
+    'cp862',
+    'cp863',
+    'cp864',
+    'cp865',
+    'cp866',
+    'cp869',
+    'cp874',
+    'cp875',
+    'cp932',
+    'cp949',
+    'cp950',
+    'cp1006',
+    'cp1026',
+    'cp1140',
+    'cp1250',
+    'cp1253',
+    'cp1254',
+    'cp1255',
+    'cp1256',
+    'cp1257',
+    'cp1258',
+}
+
+linux_codecs = {
+    'utf_8',  # Generic Linux/Mac
+}
+
+mac_codecs = [
+    'utf_8',  # Generic Linux/Mac
+    'mac_cyrillic',
+    'mac_greek',
+    'mac_iceland',
+    'mac_latin2',
+    'mac_roman',
+    'mac_turkish',
+]
+
+universal_codecs = [
+    'utf_16', 'utf_32', 'utf_32_be', 'utf_32_le', 'utf_16_be', 'utf_16_le', 'utf_7', 'utf_8_sig',
+]
+
+other_codecs = [
+    'scii', 'big5', 'big5hkscs', 'euc_jp', 'euc_jis_2004', 'euc_jisx0213', 'euc_kr', 'gb2312', 'gbk', 'gb18030', 'hz', 'iso2022_jp', 'iso2022_jp_1',
+    'iso2022_jp_2', 'iso2022_jp_2004', 'iso2022_jp_3', 'iso2022_jp_ext', 'iso2022_kr', 'latin_1', 'iso8859_2', 'iso8859_3', 'iso8859_4', 'iso8859_5',
+    'iso8859_6', 'iso8859_7', 'iso8859_8', 'iso8859_9', 'iso8859_10', 'iso8859_11', 'iso8859_13', 'iso8859_14', 'iso8859_15', 'iso8859_16', 'johab', 'koi8_r',
+    'koi8_u', 'ptcp154', 'shift_jis', 'shift_jis_2004', 'shift_jisx0213'
+]
+
+system_names = {
+    'Windows': windows_codecs,
+    'Linux': linux_codecs,
+    'Darwin': mac_codecs,
+}
+
+
+def GetPath(root, file=None, codec=None):
+    # Replace this with the function we actually use for this
+    path = os.path.realpath(os.path.abspath(root))
+
+    if file:
+        path = os.path.join(path, file)
+
+    if codec:
+        path = path.decode(codec)
+
+    return path
+
+def GetUnicodePath(root, file=None, codec=None):
+    # Replace this with the function we actually use for this
+    path = os.path.realpath(os.path.abspath(root))
+
+    if file:
+        path = os.path.join(path, file)
+
+    if codec:
+        path = str(path, codec)
+    else:
+        path = str(path)
+
+    return path

config.py

@@ -1,48 +1,62 @@
 import os
 import sys
 
-# TODO: move all logging back to pyfa.py main loop
+from logbook import CRITICAL, DEBUG, ERROR, FingersCrossedHandler, INFO, Logger, NestedSetup, NullHandler, \
-# We moved it here just to avoid rebuilding windows skeleton for now (any change to pyfa.py needs it)
+    StreamHandler, TimedRotatingFileHandler, WARNING
-import logging
+import hashlib
-import logging.handlers
+
+from cryptography.fernet import Fernet
+
+pyfalog = Logger(__name__)
 
 # Load variable overrides specific to distribution type
 try:
     import configforced
 except ImportError:
+    pyfalog.warning("Failed to import: configforced")
     configforced = None
 
+
 # Turns on debug mode
 debug = False
 # Defines if our saveddata will be in pyfa root or not
 saveInRoot = False
 
 # Version data
-version = "1.19.2"
+
-tag = "git"
+version = "2.0.0"
-expansionName = "Singularity"
+tag = "Stable"
-expansionVersion = "1015913"
+expansionName = "YC120.3"
+expansionVersion = "1.8"
 evemonMinVersion = "4081"
 
+minItemSearchLength = 3
+
 pyfaPath = None
 savePath = None
 saveDB = None
 gameDB = None
+logPath = None
+loggingLevel = None
+logging_setup = None
+cipher = None
+clientHash = None
+
+ESI_AUTH_PROXY = "https://www.pyfa.io" # "http://localhost:5015"
+ESI_CACHE = 'esi_cache'
+
+LOGLEVEL_MAP = {
+    "critical": CRITICAL,
+    "error": ERROR,
+    "warning": WARNING,
+    "info": INFO,
+    "debug": DEBUG,
+}
 
 
-class StreamToLogger(object):
+def getClientSecret():
-   """
+    return clientHash
-   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 isFrozen():
     if hasattr(sys, 'frozen'):
@@ -50,28 +64,46 @@ 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():
+
+def getPyfaRoot():
+    if hasattr(sys, '_MEIPASS'):
+        return sys._MEIPASS
+    base = getattr(sys.modules['__main__'], "__file__", sys.executable) if isFrozen() else __file__
+    root = os.path.dirname(os.path.realpath(os.path.abspath(base)))
+    root = root
+    return root
+
+
+def getVersion():
+    if os.path.isfile(os.path.join(pyfaPath, '.version')):
+        with open(os.path.join(pyfaPath, '.version')) as f:
+            gitVersion = f.readline()
+        return gitVersion
+    # if no version file exists, then user is running from source or not an official build
+    return version + " (git)"
+
+
+def getDefaultSave():
+    return os.path.expanduser(os.path.join("~", ".pyfa"))
+
+
+def defPaths(customSavePath=None):
     global debug
     global pyfaPath
     global savePath
     global saveDB
     global gameDB
     global saveInRoot
+    global logPath
+    global cipher
+    global clientHash
 
-    if debug:
+    pyfalog.debug("Configuring Pyfa")
-        logLevel = logging.DEBUG
-    else:
-        logLevel = logging.WARN
 
     # The main pyfa directory which contains run.py
     # Python 2.X uses ANSI by default, so we need to convert the character encoding
@@ -87,33 +119,26 @@ def defPaths():
     else:
         savePath = getattr(configforced, "savePath", None)
         if savePath is None:
-            savePath = unicode(os.path.expanduser(os.path.join("~", ".pyfa")),
+            if customSavePath is None:  # customSavePath is not overriden
-                               sys.getfilesystemencoding())
+                savePath = getDefaultSave()
+            else:
+                savePath = customSavePath
 
     __createDirs(savePath)
 
-    if isFrozen():
+    secret_file = os.path.join(savePath, ".secret")
-        os.environ["REQUESTS_CA_BUNDLE"] = os.path.join(pyfaPath, "cacert.pem")
+    if not os.path.exists(secret_file):
-        os.environ["SSL_CERT_FILE"] = os.path.join(pyfaPath, "cacert.pem")
+        with open(secret_file, "wb") as _file:
+            _file.write(Fernet.generate_key())
 
-    format = '%(asctime)s %(name)-24s %(levelname)-8s %(message)s'
+    with open(secret_file, 'rb') as fp:
-    logging.basicConfig(format=format, level=logLevel)
+        key = fp.read()
-    handler = logging.handlers.RotatingFileHandler(os.path.join(savePath, "log.txt"), maxBytes=1000000, backupCount=3)
+        clientHash = hashlib.sha3_256(key).hexdigest()
-    formatter = logging.Formatter(format)
+        cipher = Fernet(key)
-    handler.setFormatter(formatter)
-    logging.getLogger('').addHandler(handler)
 
-    logging.info("Starting pyfa")
+    # if isFrozen():
-
+    #    os.environ["REQUESTS_CA_BUNDLE"] = os.path.join(pyfaPath, "cacert.pem")
-    if hasattr(sys, 'frozen'):
+    #    os.environ["SSL_CERT_FILE"] = os.path.join(pyfaPath, "cacert.pem")
-        stdout_logger = logging.getLogger('STDOUT')
-        sl = StreamToLogger(stdout_logger, logging.INFO)
-        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
 
     # The database where we store all the fits etc
     saveDB = os.path.join(savePath, "saveddata.db")
@@ -121,13 +146,120 @@ def defPaths():
     # 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 = getattr(configforced, "gameDB", gameDB)
+    if not gameDB:
+        gameDB = os.path.join(pyfaPath, "eve.db")
 
-    ## DON'T MODIFY ANYTHING BELOW ##
+    if debug:
+        logFile = "pyfa_debug.log"
+    else:
+        logFile = "pyfa.log"
+
+    logPath = os.path.join(savePath, logFile)
+
+    # 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"
+
+    print(eos.config.saveddata_connectionstring)
+    print(eos.config.gamedata_connectionstring)
+
+    # initialize the settings
+    from service.settings import EOSSettings
+    eos.config.settings = EOSSettings.getInstance().EOSSettings  # this is kind of confusing, but whatever
+
+
+def defLogging():
+    global debug
+    global logPath
+    global loggingLevel
+    global logging_setup
+
+    try:
+        if debug:
+            logging_setup = NestedSetup([
+                # make sure we never bubble up to the stderr handler
+                # if we run out of setup handling
+                NullHandler(),
+                StreamHandler(
+                        sys.stdout,
+                        bubble=False,
+                        level=loggingLevel
+                ),
+                TimedRotatingFileHandler(
+                        logPath,
+                        level=0,
+                        backup_count=3,
+                        bubble=True,
+                        date_format='%Y-%m-%d',
+                ),
+            ])
+        else:
+            logging_setup = NestedSetup([
+                # make sure we never bubble up to the stderr handler
+                # if we run out of setup handling
+                NullHandler(),
+                FingersCrossedHandler(
+                        TimedRotatingFileHandler(
+                                logPath,
+                                level=0,
+                                backup_count=3,
+                                bubble=False,
+                                date_format='%Y-%m-%d',
+                        ),
+                        action_level=ERROR,
+                        buffer_size=1000,
+                        # pull_information=True,
+                        # reset=False,
+                )
+            ])
+    except:
+        print("Critical error attempting to setup logging. Falling back to console only.")
+        logging_setup = NestedSetup([
+            # make sure we never bubble up to the stderr handler
+            # if we run out of setup handling
+            NullHandler(),
+            StreamHandler(
+                    sys.stdout,
+                    bubble=False
+            )
+        ])
+
+    with logging_setup.threadbound():
+
+        # Output all stdout (print) messages as warnings
+        try:
+            sys.stdout = LoggerWriter(pyfalog.warning)
+        except:
+            pyfalog.critical("Cannot redirect.  Continuing without writing stdout to log.")
+
+        # Output all stderr (stacktrace) messages as critical
+        try:
+            sys.stderr = LoggerWriter(pyfalog.critical)
+        except:
+            pyfalog.critical("Cannot redirect.  Continuing without writing stderr to log.")
+
+
+class LoggerWriter(object):
+    def __init__(self, level):
+        # self.level is really like using log.debug(message)
+        # at least in my case
+        self.level = level
+
+    def write(self, message):
+        # if statement reduces the amount of newlines that are
+        # printed to the logger
+        if message.strip() != '':
+            self.level(message.replace("\n", ""))
+
+    def flush(self):
+        # create a flush method so things can be flushed when
+        # the system wants to. Not sure if simply 'printing'
+        # sys.stderr is the correct way to do it, but it seemed
+        # to work properly for me.
+        self.level(sys.stderr)

dist_assets/linux/pyfa-linux.spec

@@ -0,0 +1,70 @@
+# -*- mode: python -*-
+
+import os
+from itertools import chain
+import subprocess
+
+label = subprocess.check_output([
+    "git", "describe", "--tags"]).strip()
+
+with open('gitversion', 'w+') as f:
+    f.write(label.decode())
+
+block_cipher = None
+
+
+added_files = [
+             ( 'imgs/gui/*.png', 'imgs/gui' ),
+             ( 'imgs/gui/*.gif', 'imgs/gui' ),
+             ( 'imgs/icons/*.png', 'imgs/icons' ),
+             ( 'imgs/renders/*.png', 'imgs/renders' ),
+             ( 'dist_assets/win/pyfa.ico', '.' ),
+             ( 'dist_assets/cacert.pem', '.' ),
+             ( 'eve.db', '.' ),
+             ( 'README.md', '.' ),
+             ( 'LICENSE', '.' ),
+             ( 'gitversion', '.' ),
+             ]
+
+import_these = []
+
+# Walk directories that do dynamic importing
+paths = ('eos/effects', 'eos/db/migrations', 'service/conversions')
+for root, folders, files in chain.from_iterable(os.walk(path) for path in paths):
+    for file_ in files:
+        if file_.endswith(".py") and not file_.startswith("_"):
+            mod_name = "{}.{}".format(
+                root.replace("/", "."),
+                file_.split(".py")[0],
+            )
+            import_these.append(mod_name)
+
+
+a = Analysis(['pyfa.py'],
+             pathex=[],
+             binaries=[],
+             datas=added_files,
+             hiddenimports=import_these,
+             hookspath=[],
+             runtime_hooks=[],
+             excludes=[],
+             win_no_prefer_redirects=False,
+             win_private_assemblies=False,
+             cipher=block_cipher)
+pyz = PYZ(a.pure, a.zipped_data,
+             cipher=block_cipher)
+exe = EXE(pyz,
+          a.scripts,
+          exclude_binaries=True,
+          name='pyfa',
+          debug=False,
+          strip=False,
+          upx=True,
+          console=True )
+coll = COLLECT(exe,
+               a.binaries,
+               a.zipfiles,
+               a.datas,
+               strip=False,
+               upx=True,
+               name='pyfa')

dist_assets/mac/pyfa.spec

@@ -0,0 +1,74 @@
+# -*- mode: python -*-
+
+import os
+from itertools import chain
+import subprocess
+import requests.certs
+
+label = subprocess.check_output([
+    "git", "describe", "--tags"]).strip()
+
+with open('.version', 'w+') as f:
+    f.write(label.decode())
+
+block_cipher = None
+
+added_files = [
+             ('../../imgs/gui/*.png', 'imgs/gui'),
+             ('../../imgs/gui/*.gif', 'imgs/gui'),
+             ('../../imgs/icons/*.png', 'imgs/icons'),
+             ('../../imgs/renders/*.png', 'imgs/renders'),
+             ('../../dist_assets/win/pyfa.ico', '.'),
+             ('../../service/jargon/*.yaml', 'service/jargon'),
+             (requests.certs.where(), '.'),  # is this needed anymore?
+             ('../../eve.db', '.'),
+             ('../../README.md', '.'),
+             ('../../LICENSE', '.'),
+             ('../../.version', '.'),
+             ]
+
+
+import_these = []
+
+# Walk directories that do dynamic importing
+paths = ('eos/effects', 'eos/db/migrations', 'service/conversions')
+for root, folders, files in chain.from_iterable(os.walk(path) for path in paths):
+    for file_ in files:
+        if file_.endswith(".py") and not file_.startswith("_"):
+            mod_name = "{}.{}".format(
+                root.replace("/", "."),
+                file_.split(".py")[0],
+            )
+            import_these.append(mod_name)
+
+a = Analysis([r'../../pyfa.py'],
+             pathex=[],
+             binaries=[],
+             datas=added_files,
+             hiddenimports=import_these,
+             hookspath=['dist_assets/pyinstaller_hooks'],
+             runtime_hooks=[],
+             excludes=[],
+             win_no_prefer_redirects=False,
+             win_private_assemblies=False,
+             cipher=block_cipher)
+pyz = PYZ(a.pure, a.zipped_data,
+             cipher=block_cipher)
+exe = EXE(pyz,
+          a.scripts,
+          a.binaries,
+          a.zipfiles,
+          a.datas,
+          name='pyfa',
+          debug=False,
+          strip=False,
+          upx=True,
+          runtime_tmpdir=None,
+          console=False ,
+          icon='dist_assets/mac/pyfa.icns',
+          )
+
+app = BUNDLE(exe,
+             name='pyfa.app',
+             icon=None,
+             bundle_identifier=None)

dist_assets/pyinstaller_hooks/hook-matplotlib.backends.py

@@ -0,0 +1,78 @@
+# This apes hook-matplotlib.backends.py, but REMOVES backends, all but
+# the ones in the list below.
+# Courtesy of https://github.com/bpteague/cytoflow/blob/70f9291/packaging/hook-matplotlib.backends.py
+
+KEEP = ["WXAgg", "WX", "agg"]
+
+from PyInstaller.compat import is_darwin
+from PyInstaller.utils.hooks import (
+    eval_statement, exec_statement, logger)
+
+
+def get_matplotlib_backend_module_names():
+    """
+    List the names of all matplotlib backend modules importable under the
+    current Python installation.
+    Returns
+    ----------
+    list
+        List of the fully-qualified names of all such modules.
+    """
+    # Statement safely importing a single backend module.
+    import_statement = """
+import os, sys
+# Preserve stdout.
+sys_stdout = sys.stdout
+try:
+    # Redirect output printed by this importation to "/dev/null", preventing
+    # such output from being erroneously interpreted as an error.
+    with open(os.devnull, 'w') as dev_null:
+        sys.stdout = dev_null
+        __import__('%s')
+# If this is an ImportError, print this exception's message without a traceback.
+# ImportError messages are human-readable and require no additional context.
+except ImportError as exc:
+    sys.stdout = sys_stdout
+    print(exc)
+# Else, print this exception preceded by a traceback. traceback.print_exc()
+# prints to stderr rather than stdout and must not be called here!
+except Exception:
+    sys.stdout = sys_stdout
+    import traceback
+    print(traceback.format_exc())
+"""
+
+    # List of the human-readable names of all available backends.
+    backend_names = eval_statement(
+        'import matplotlib; print(matplotlib.rcsetup.all_backends)')
+
+    # List of the fully-qualified names of all importable backend modules.
+    module_names = []
+
+    # If the current system is not OS X and the "CocoaAgg" backend is available,
+    # remove this backend from consideration. Attempting to import this backend
+    # on non-OS X systems halts the current subprocess without printing output
+    # or raising exceptions, preventing its reliable detection.
+    if not is_darwin and 'CocoaAgg' in backend_names:
+        backend_names.remove('CocoaAgg')
+
+    # For safety, attempt to import each backend in a unique subprocess.
+    for backend_name in backend_names:
+        if backend_name in KEEP:
+            continue
+
+        module_name = 'matplotlib.backends.backend_%s' % backend_name.lower()
+        stdout = exec_statement(import_statement % module_name)
+
+        # If no output was printed, this backend is importable.
+        if not stdout:
+            module_names.append(module_name)
+            logger.info('  Matplotlib backend "%s": removed' % backend_name)
+
+    return module_names
+
+# Freeze all importable backends, as PyInstaller is unable to determine exactly
+# which backends are required by the current program.
+e=get_matplotlib_backend_module_names()
+print(e)
+excludedimports = e

dist_assets/win/pyfa.spec

@@ -0,0 +1,82 @@
+# -*- mode: python -*-
+
+import os
+from itertools import chain
+import subprocess
+import requests.certs
+
+label = subprocess.check_output([
+    "git", "describe", "--tags"]).strip()
+
+with open('.version', 'w+') as f:
+    f.write(label.decode())
+
+block_cipher = None
+
+added_files = [
+             ('../../imgs/gui/*.png', 'imgs/gui'),
+             ('../../imgs/gui/*.gif', 'imgs/gui'),
+             ('../../imgs/icons/*.png', 'imgs/icons'),
+             ('../../imgs/renders/*.png', 'imgs/renders'),
+             ('../../service/jargon/*.yaml', 'service/jargon'),
+             ('../../dist_assets/win/pyfa.ico', '.'),
+             (requests.certs.where(), '.'),  # is this needed anymore?
+             ('../../eve.db', '.'),
+             ('../../README.md', '.'),
+             ('../../LICENSE', '.'),
+             ('../../.version', '.'),
+             ]
+
+import_these = []
+
+# Walk directories that do dynamic importing
+paths = ('eos/effects', 'eos/db/migrations', 'service/conversions')
+for root, folders, files in chain.from_iterable(os.walk(path) for path in paths):
+    for file_ in files:
+        if file_.endswith(".py") and not file_.startswith("_"):
+            mod_name = "{}.{}".format(
+                root.replace("/", "."),
+                file_.split(".py")[0],
+            )
+            import_these.append(mod_name)
+
+a = Analysis(['../../pyfa.py'],
+             pathex=[
+                 # Need this, see https://github.com/pyinstaller/pyinstaller/issues/1566
+                 # To get this, download and install windows 10 SDK
+                 # If not building on Windows 10, this might be optional
+                 r'C:\Program Files (x86)\Windows Kits\10\Redist\ucrt\DLLs\x86'],
+             binaries=[],
+             datas=added_files,
+             hiddenimports=import_these,
+             hookspath=['dist_assets/pyinstaller_hooks'],
+             runtime_hooks=[],
+             excludes=['Tkinter'],
+             win_no_prefer_redirects=False,
+             win_private_assemblies=False,
+             cipher=block_cipher)
+
+pyz = PYZ(a.pure, a.zipped_data,
+             cipher=block_cipher)
+
+exe = EXE(pyz,
+          a.scripts,
+          exclude_binaries=True,
+          debug=False,
+          console=False,
+          strip=False,
+          upx=True,
+          name='pyfa',
+          icon='dist_assets/win/pyfa.ico',
+          )
+
+coll = COLLECT(
+               exe,
+               a.binaries,
+               a.zipfiles,
+               a.datas,
+               strip=False,
+               upx=True,
+               name='pyfa',
+               icon='dist_assets/win/pyfa.ico',
+               )

dist_assets/win/pyfa_debug.spec

@@ -0,0 +1,83 @@
+# -*- mode: python -*-
+
+# Note: This script is provided AS-IS for those that may be interested.
+# pyfa does not currently support pyInstaller (or any other build process) 100% at the moment
+
+# Command line to build:
+# (Run from directory where pyfa.py and pyfa.spec lives.)
+# c:\Python27\scripts\pyinstaller.exe --clean --noconfirm --windowed --upx-dir=.\scripts\upx.exe pyfa.spec
+
+# Don't forget to change the path to where your pyfa.py and pyfa.spec lives
+#  pathex=['C:\\Users\\Ebag333\\Documents\\GitHub\\Ebag333\\Pyfa'],
+
+import os
+
+block_cipher = None
+
+added_files = [
+             ( 'imgs/gui/*.png', 'imgs/gui' ),
+             ( 'imgs/gui/*.gif', 'imgs/gui' ),
+             ( 'imgs/icons/*.png', 'imgs/icons' ),
+             ( 'imgs/renders/*.png', 'imgs/renders' ),
+             ( 'dist_assets/win/pyfa.ico', '.' ),
+             ( 'dist_assets/cacert.pem', '.' ),
+             ( 'eve.db', '.' ),
+             ( 'README.md', '.' ),
+             ( 'LICENSE', '.' ),
+             ]
+
+import_these = []
+
+# Walk eos.effects and add all effects so we can import them properly
+for root, folders, files in os.walk("eos/effects"):
+    for file_ in files:
+        if file_.endswith(".py") and not file_.startswith("_"):
+            mod_name = "{}.{}".format(
+                root.replace("/", "."),
+                file_.split(".py")[0],
+            )
+            import_these.append(mod_name)
+
+a = Analysis(
+             ['pyfa.py'],
+             pathex=['C:\\projects\\pyfa\\'],
+             binaries=[],
+             datas=added_files,
+             hiddenimports=import_these,
+             hookspath=[],
+             runtime_hooks=[],
+             excludes=[],
+             win_no_prefer_redirects=False,
+             win_private_assemblies=False,
+             cipher=block_cipher,
+             )
+
+pyz = PYZ(
+          a.pure,
+          a.zipped_data,
+          cipher=block_cipher,
+          )
+
+exe = EXE(pyz,
+          a.scripts,
+          exclude_binaries=True,
+          debug=True,
+          console=True,
+          strip=False,
+          upx=True,
+          name='pyfa_debug',
+          icon='dist_assets/win/pyfa.ico',
+          onefile=False,
+          )
+
+coll = COLLECT(
+               exe,
+               a.binaries,
+               a.zipfiles,
+               a.datas,
+               strip=False,
+               upx=True,
+               onefile=False,
+               name='pyfa_debug',
+               icon='dist_assets/win/pyfa.ico',
+               )

dist_assets/win/version_resource.py

@@ -0,0 +1,45 @@
+# UTF-8
+#
+# For more details about fixed file info 'ffi' see:
+# http://msdn.microsoft.com/en-us/library/ms646997.aspx
+VSVersionInfo(
+  ffi=FixedFileInfo(
+    # filevers and prodvers should be always a tuple with four items: (1, 2, 3, 4)
+    # Set not needed items to zero 0.
+    filevers=(1, 15, 1, 0),
+    prodvers=(1, 15, 1, 0),
+    # Contains a bitmask that specifies the valid bits 'flags'r
+    mask=0x3f,
+    # Contains a bitmask that specifies the Boolean attributes of the file.
+    flags=0x0,
+    # The operating system for which this file was designed.
+    # 0x4 - NT and there is no need to change it.
+    OS=0x40004,
+    # The general type of file.
+    # 0x1 - the file is an application.
+    fileType=0x1,
+    # The function of the file.
+    # 0x0 - the function is not defined for this fileType
+    subtype=0x0,
+    # Creation date and time stamp.
+    date=(0, 0)
+    ),
+  kids=[
+    StringFileInfo(
+      [
+      StringTable(
+        u'040904E4',
+        [StringStruct(u'LegalCopyright', u''),
+        StringStruct(u'InternalName', u'pyfa.exe'),
+        StringStruct(u'FileVersion', u'1.15.1.0'),
+        StringStruct(u'CompanyName', u''),
+        StringStruct(u'OriginalFilename', u'pyfa.exe'),
+        StringStruct(u'ProductVersion', u'1.15.1.0'),
+        StringStruct(u'FileDescription', u'Python fitting assistant'),
+        StringStruct(u'LegalTrademarks', u''),
+        StringStruct(u'Comments', u''),
+        StringStruct(u'ProductName', u'pyfa')])
+      ]),
+    VarFileInfo([VarStruct(u'Translation', [1033, 1252])])
+  ]
+)

eos/__init__.py

@@ -1,7 +1,2 @@
-version = "0.2.3"
+version = "0.2.3"
-tag = "git"
+tag = "git"
-
-def test():
-    import tests.runTests
-    import unittest
-    unittest.main(defaultTest="discover", testLoader=tests.runTests.loader)

eos/capSim.py

@@ -1,12 +1,13 @@
 import heapq
-from math import sqrt, exp
 import time
-
+from math import sqrt, exp
+from functools import reduce
 
 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 +41,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:
+                if mod > res / 2.0:
-                    mod = res-mod
+                    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
@@ -72,7 +72,7 @@ class CapSimulator(object):
         disable_period = False
 
         # Loop over modules, clearing clipSize if applicable, and group modules based on attributes
-        for (duration, capNeed, clipSize, disableStagger) in self.modules:
+        for (duration, capNeed, clipSize, disableStagger, reloadTime) in self.modules:
             if self.scale:
                 duration, capNeed = self.scale_activation(duration, capNeed)
 
@@ -80,24 +80,25 @@ class CapSimulator(object):
             # a cap booster module.
             if not self.reload and capNeed > 0:
                 clipSize = 0
+                reloadTime = 0
 
             # Group modules based on their properties
-            if (duration, capNeed, clipSize, disableStagger) in mods:
+            if (duration, capNeed, clipSize, disableStagger, reloadTime) in mods:
-                mods[(duration, capNeed, clipSize, disableStagger)] += 1
+                mods[(duration, capNeed, clipSize, disableStagger, reloadTime)] += 1
             else:
-                mods[(duration, capNeed, clipSize, disableStagger)] = 1
+                mods[(duration, capNeed, clipSize, disableStagger, reloadTime)] = 1
 
         # Loop over grouped modules, configure staggering and push to the simulation state
-        for (duration, capNeed, clipSize, disableStagger), amount in mods.iteritems():
+        for (duration, capNeed, clipSize, disableStagger, reloadTime), amount in mods.items():
             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 + reloadTime) / (amount * clipSize)
                     for i in range(1, amount):
                         heapq.heappush(self.state,
-                                       [i*stagger_amount, duration,
+                                       [i * stagger_amount, duration,
-                                        capNeed, 0, clipSize])
+                                        capNeed, 0, clipSize, reloadTime])
             else:
                 capNeed *= amount
 
@@ -107,15 +108,13 @@ class CapSimulator(object):
             if clipSize:
                 disable_period = True
 
-            heapq.heappush(self.state, [0, duration, capNeed, 0, clipSize])
+            heapq.heappush(self.state, [0, duration, capNeed, 0, clipSize, reloadTime])
-
 
         if disable_period:
             self.period = self.t_max
         else:
             self.period = period
 
-
     def run(self):
         """Run the simulation"""
 
@@ -135,22 +134,22 @@ class CapSimulator(object):
         capCapacity = self.capacitorCapacity
         tau = self.capacitorRecharge / 5.0
 
-        cap_wrap = capCapacity                # cap value at last period
+        cap_wrap = capCapacity  # cap value at last period
-        cap_lowest = capCapacity            # lowest cap value encountered
+        cap_lowest = capCapacity  # lowest cap value encountered
-        cap_lowest_pre = capCapacity    # lowest cap value before activations
+        cap_lowest_pre = capCapacity  # lowest cap value before activations
-        cap = capCapacity                         # current cap value
+        cap = capCapacity  # current cap value
-        t_wrap = self.period                    # point in time of next period
+        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:
             activation = pop(state)
-            t_now, duration, capNeed, shot, clipSize = activation
+            t_now, duration, capNeed, shot, clipSize, reloadTime = activation
             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 +181,7 @@ class CapSimulator(object):
             if clipSize:
                 if shot % clipSize == 0:
                     shot = 0
-                    t_now += 10000    # include reload time
+                    t_now += reloadTime  # include reload time
             activation[0] = t_now
             activation[3] = shot
 
@@ -195,19 +194,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)
+            avgDrain = reduce(float.__add__, [x[2] / x[1] for x in self.state], 0.0)
-            self.cap_stable_eve = 0.25 * (1.0 + sqrt(-(2.0 * avgDrain * tau - capCapacity)/capCapacity)) ** 2
+            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_low = \
-            self.cap_stable_high = 0.0
+                self.cap_stable_high = 0.0
 
-
+        self.runtime = time.time() - start
-        self.runtime = time.time()-start

eos/config.py

@@ -1,11 +1,31 @@
-from os.path import realpath, join, dirname, abspath
 import sys
+from os.path import realpath, join, dirname, abspath
+
+from logbook import Logger
+import os
+
+istravis = os.environ.get('TRAVIS') == 'true'
+pyfalog = Logger(__name__)
 
 debug = False
 gamedataCache = True
 saveddataCache = True
-gamedata_connectionstring = 'sqlite:///' + unicode(realpath(join(dirname(abspath(__file__)), "..", "eve.db")), sys.getfilesystemencoding())
+gamedata_version = ""
-saveddata_connectionstring = 'sqlite:///' + unicode(realpath(join(dirname(abspath(__file__)), "..", "saveddata", "saveddata.db")), sys.getfilesystemencoding())
+gamedata_connectionstring = 'sqlite:///' + realpath(join(dirname(abspath(__file__)), "..", "eve.db"))
+pyfalog.debug("Gamedata connection string: {0}", gamedata_connectionstring)
 
-#Autodetect path, only change if the autodetection bugs out.
+if istravis is True or hasattr(sys, '_called_from_test'):
-path = dirname(unicode(__file__, sys.getfilesystemencoding()))
+    # Running in Travis. Run saveddata database in memory.
+    saveddata_connectionstring = 'sqlite:///:memory:'
+else:
+    saveddata_connectionstring = 'sqlite:///' + realpath(join(dirname(abspath(__file__)), "..", "saveddata", "saveddata-py3-db.db"))
+
+pyfalog.debug("Saveddata connection string: {0}", saveddata_connectionstring)
+
+settings = {
+    "useStaticAdaptiveArmorHardener": False,
+    "strictSkillLevels": True,
+}
+
+# Autodetect path, only change if the autodetection bugs out.
+path = dirname(__file__)

eos/db/__init__.py

@@ -1,4 +1,4 @@
-#===============================================================================
+# ===============================================================================
 # Copyright (C) 2010 Diego Duclos
 #
 # This file is part of eos.
@@ -15,26 +15,31 @@
 #
 # 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
 
 from sqlalchemy import MetaData, create_engine
-from sqlalchemy.orm import sessionmaker, scoped_session
+from sqlalchemy.orm import sessionmaker
-from sqlalchemy.ext.declarative import declarative_base
-from sqlalchemy import pool
 
+from . import migration
 from eos import config
-import migration
+from logbook import Logger
+
+pyfalog = Logger(__name__)
+pyfalog.info("Initializing database")
+pyfalog.info("Gamedata connection: {0}", config.gamedata_connectionstring)
+pyfalog.info("Saveddata connection: {0}", config.saveddata_connectionstring)
 
 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
@@ -45,8 +50,10 @@ gamedata_session = sessionmaker(bind=gamedata_engine, autoflush=False, expire_on
 try:
     config.gamedata_version = gamedata_session.execute(
             "SELECT `field_value` FROM `metadata` WHERE `field_name` LIKE 'client_build'"
-        ).fetchone()[0]
+    ).fetchone()[0]
-except:
+except Exception as e:
+    pyfalog.warning("Missing gamedata version.")
+    pyfalog.critical(e)
     config.gamedata_version = None
 
 saveddata_connectionstring = config.saveddata_connectionstring
@@ -59,23 +66,32 @@ if saveddata_connectionstring is not None:
     saveddata_meta = MetaData()
     saveddata_meta.bind = saveddata_engine
     saveddata_session = sessionmaker(bind=saveddata_engine, autoflush=False, expire_on_commit=False)()
+else:
+    saveddata_meta = None
 
 # Lock controlling any changes introduced to session
-sd_lock = threading.Lock()
+sd_lock = threading.RLock()
 
-#Import all the definitions for all our database stuff
+# Import all the definitions for all our database stuff
-from eos.db.gamedata import *
+# noinspection PyPep8
-from eos.db.saveddata import *
+from eos.db.gamedata import alphaClones, attribute, category, effect, group, icon, item, marketGroup, metaData, metaGroup, queries, traits, unit
+# noinspection PyPep8
+from eos.db.saveddata import booster, cargo, character, damagePattern, databaseRepair, drone, fighter, fit, implant, implantSet, loadDefaultDatabaseValues, \
+    miscData, module, override, price, queries, skill, targetResists, user
 
-#Import queries
+# Import queries
+# noinspection PyPep8
 from eos.db.gamedata.queries import *
+# noinspection PyPep8
 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()
+    pyfalog.info("Running database out of memory.")
+
 
 def rollback():
     with sd_lock:
+        pyfalog.warning("Session rollback triggered.")
         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,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 Column, String, Integer, Table, ForeignKey
+from sqlalchemy.orm import relation, mapper, synonym
+
+from eos.db import gamedata_meta
+from eos.gamedata 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.gamedata import Attribute, AttributeInfo, Unit, Icon
+
 typeattributes_table = Table("dgmtypeattribs", gamedata_meta,
-                         Column("value", Float),
+                             Column("value", Float),
-                         Column("typeID", Integer, ForeignKey("invtypes.typeID"), primary_key=True, index=True),
+                             Column("typeID", Integer, ForeignKey("invtypes.typeID"), primary_key=True, index=True),
-                         Column("attributeID", ForeignKey("dgmattribs.attributeID"), primary_key=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,16 @@ 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),
+       properties={
-                     "unit": relation(Unit),
+           "icon"       : relation(Icon),
-                     "ID": synonym("attributeID"),
+           "unit"       : relation(Unit),
-                     "name": synonym("attributeName"),
+           "ID"         : synonym("attributeID"),
-                     "description" : deferred(attributes_table.c.description)})
+           "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,23 +15,25 @@
 #
 # 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
 
 from eos.db import gamedata_meta
-from eos.types import Category, Icon
+from eos.gamedata 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),
+       properties={
-                     "ID" : synonym("categoryID"),
+           "icon"       : relation(Icon),
-                     "name" : synonym("categoryName"),
+           "ID"         : synonym("categoryID"),
-                     "description" : deferred(categories_table.c.description)})
+           "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,36 +15,32 @@
 #
 # 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, deferred
-from sqlalchemy.orm import mapper, synonym, relation, deferred
+
-from eos.types import Effect, EffectInfo
 from eos.db import gamedata_meta
+from eos.gamedata import Effect, ItemEffect
 
 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))
+                      Column("isOffensive", Boolean),
+                      Column("resistanceID", Integer))
 
+mapper(Effect, effects_table,
+       properties={
+           "ID"         : synonym("effectID"),
+           "name"       : synonym("effectName"),
+           "description": deferred(effects_table.c.description)
+       })
 
-mapper(EffectInfo, effects_table,
+mapper(ItemEffect, typeeffects_table)
-       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)})
-
-Effect.name = association_proxy("info", "name")
-Effect.description = association_proxy("info", "description")
-Effect.published = association_proxy("info", "published")

eos/db/gamedata/group.py

@@ -1,4 +1,4 @@
-#===============================================================================
+# ===============================================================================
 # Copyright (C) 2010 Diego Duclos
 #
 # This file is part of eos.
@@ -15,16 +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, String, Integer, Boolean, ForeignKey, Table
 from sqlalchemy.orm import relation, mapper, synonym, deferred
 
 from eos.db import gamedata_meta
-from eos.types import Group, Icon, Category
+from eos.gamedata import Category, Group, Icon
 
 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,10 @@ groups_table = Table("invgroups", gamedata_meta,
                      Column("iconID", Integer, ForeignKey("icons.iconID")))
 
 mapper(Group, groups_table,
-       properties = {"category" : relation(Category, backref = "groups"),
+       properties={
-                     "icon" : relation(Icon),
+           "category"   : relation(Category, backref="groups"),
-                     "ID" : synonym("groupID"),
+           "icon"       : relation(Icon),
-                     "name" : synonym("groupName"),
+           "ID"         : synonym("groupID"),
-                     "description" : deferred(groups_table.c.description)})
+           "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,19 +15,21 @@
 #
 # 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
 
 from eos.db import gamedata_meta
-from eos.types import Icon
+from eos.gamedata 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"),
+       properties={
-                     "description" : deferred(icons_table.c.description)})
+           "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,19 @@
 #
 # 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.gamedata.effect import typeeffects_table
 
 from eos.db import gamedata_meta
-from eos.types import Icon, Attribute, Item, Effect, MetaType, Group, Traits
+from eos.gamedata import Attribute, Effect, Group, Icon, Item, MetaType, 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 +40,24 @@ 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 .metaGroup import metatypes_table  # noqa
-from .traits import traits_table
+from .traits import traits_table  # noqa
 
 mapper(Item, items_table,
-       properties = {"group" : relation(Group, backref = "items"),
+       properties={
-                     "icon" : relation(Icon),
+           "group"            : relation(Group, backref="items"),
-                     "_Item__attributes" : relation(Attribute, collection_class = attribute_mapped_collection('name')),
+           "icon"             : relation(Icon),
-                     "effects" : relation(Effect, collection_class = attribute_mapped_collection('name')),
+           "_Item__attributes": relation(Attribute, cascade='all, delete, delete-orphan', collection_class=attribute_mapped_collection('name')),
-                     "metaGroup" : relation(MetaType,
+           "effects": relation(Effect, secondary=typeeffects_table, collection_class=attribute_mapped_collection('name')),
-                                            primaryjoin = metatypes_table.c.typeID == items_table.c.typeID,
+           "metaGroup"        : relation(MetaType,
-                                            uselist = False),
+                                         primaryjoin=metatypes_table.c.typeID == items_table.c.typeID,
-                     "ID" : synonym("typeID"),
+                                         uselist=False),
-                     "name" : synonym("typeName"),
+           "ID"               : synonym("typeID"),
-                     "description" : deferred(items_table.c.description),
+           "name"             : synonym("typeName"),
-                     "traits" : relation(Traits,
+           "description"      : deferred(items_table.c.description),
-                                         primaryjoin = traits_table.c.typeID == items_table.c.typeID,
+           "traits"           : relation(Traits,
-                                         uselist = False)
+                                         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,26 +15,30 @@
 #
 # 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
 
 from eos.db import gamedata_meta
-from eos.types import Item, MarketGroup, Icon
+from eos.gamedata import Icon, Item, MarketGroup
 
 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"),
+       properties={
-                     "parent" : relation(MarketGroup, backref = "children", remote_side = [marketgroups_table.c.marketGroupID]),
+           "items"      : relation(Item, backref="marketGroup"),
-                     "icon" : relation(Icon),
+           "parent"     : relation(MarketGroup, backref="children",
-                     "ID" : synonym("marketGroupID"),
+                                   remote_side=[marketgroups_table.c.marketGroupID]),
-                     "name" : synonym("marketGroupName"),
+           "icon"       : relation(Icon),
-                     "description" : deferred(marketgroups_table.c.description)})
+           "ID"         : synonym("marketGroupID"),
+           "name"       : synonym("marketGroupName"),
+           "description": deferred(marketgroups_table.c.description)
+        })

eos/db/gamedata/metaData.py

@@ -1,29 +1,30 @@
-#===============================================================================
+# ===============================================================================
-# Copyright (C) 2010 Diego Duclos
+# Copyright (C) 2010 Diego Duclos
-#
+#
-# This file is part of eos.
+# This file is part of eos.
-#
+#
-# eos is free software: you can redistribute it and/or modify
+# 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
+# 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
+# the Free Software Foundation, either version 2 of the License, or
-# (at your option) any later version.
+# (at your option) any later version.
-#
+#
-# eos is distributed in the hope that it will be useful,
+# eos is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License for more details.
+# GNU Lesser General Public License for more details.
-#
+#
-# You should have received a copy of the GNU Lesser General Public License
+# You should have received a copy of the GNU Lesser General Public License
-# along with eos.  If not, see <http://www.gnu.org/licenses/>.
+# along with eos.  If not, see <http://www.gnu.org/licenses/>.
-#===============================================================================
+# ===============================================================================
-
+
-from sqlalchemy import Column, Table, String
+from sqlalchemy import Column, Table, String
-from sqlalchemy.orm import mapper
+from sqlalchemy.orm import mapper
-from eos.types import MetaData
+
-from eos.db import gamedata_meta
+from eos.db import gamedata_meta
-
+from eos.gamedata import MetaData
-metadata_table = Table("metadata", gamedata_meta,
+
-                           Column("field_name", String, primary_key=True),
+metadata_table = Table("metadata", gamedata_meta,
-                           Column("field_value", String))
+                       Column("field_name", String, primary_key=True),
-
+                       Column("field_value", String))
-mapper(MetaData, metadata_table)
+
+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,37 @@
 #
 # 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 eos.gamedata import Item, MetaGroup, 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"),
+       properties={
-                     "name" : synonym("metaGroupName")})
+           "ID"  : synonym("metaGroupID"),
+           "name": synonym("metaGroupName")
+        })
 
 mapper(MetaType, metatypes_table,
-       properties = {"ID" : synonym("metaGroupID"),
+       properties={
-                     "parent" : relation(Item, primaryjoin = metatypes_table.c.parentTypeID == items_table.c.typeID),
+           "ID"    : synonym("metaGroupID"),
-                     "items" : relation(Item, primaryjoin = metatypes_table.c.typeID == items_table.c.typeID),
+           "parent": relation(Item, primaryjoin=metatypes_table.c.parentTypeID == items_table.c.typeID),
-                     "info": relation(MetaGroup, lazy=False)})
+           "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,23 @@
 #
 # 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, aliased
+from sqlalchemy.sql import and_, or_, select
+
+import eos.config
 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 eos.db.gamedata.group import groups_table
-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.gamedata import AlphaClone, Attribute, Category, Group, Item, MarketGroup, MetaGroup, AttributeInfo, MetaData
 
+cache = {}
 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 +47,7 @@ if configVal is True:
                 return handler
 
             return checkAndReturn
+
         return deco
 
 elif callable(configVal):
@@ -56,8 +59,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 +70,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):
@@ -73,7 +81,7 @@ def getItem(lookfor, eager=None):
             item = gamedata_session.query(Item).get(lookfor)
         else:
             item = gamedata_session.query(Item).options(*processEager(eager)).filter(Item.ID == lookfor).first()
-    elif isinstance(lookfor, basestring):
+    elif isinstance(lookfor, str):
         if lookfor in itemNameMap:
             id = itemNameMap[lookfor]
             if eager is None:
@@ -88,7 +96,57 @@ def getItem(lookfor, eager=None):
         raise TypeError("Need integer or string as argument")
     return item
 
+
+@cachedQuery(1, "lookfor")
+def getItems(lookfor, eager=None):
+    """
+    Gets a list of items. Does a bit of cache hackery to get working properly -- cache
+    is usually based on function calls with the parameters, needed to extract data directly.
+    Works well enough. Not currently used, but it's here for possible future inclusion
+    """
+
+    toGet = []
+    results = []
+
+    for id in lookfor:
+        if (id, None) in cache:
+            results.append(cache.get((id, None)))
+        else:
+            toGet.append(id)
+
+    if len(toGet) > 0:
+        # Get items that aren't currently cached, and store them in the cache
+        items = gamedata_session.query(Item).filter(Item.ID.in_(toGet)).all()
+        for item in items:
+            cache[(item.ID, None)] = item
+        results += items
+
+    # sort the results based on the original indexing
+    results.sort(key=lambda x: lookfor.index(x.ID))
+    return results
+
+
+@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):
@@ -96,7 +154,7 @@ def getGroup(lookfor, eager=None):
             group = gamedata_session.query(Group).get(lookfor)
         else:
             group = gamedata_session.query(Group).options(*processEager(eager)).filter(Group.ID == lookfor).first()
-    elif isinstance(lookfor, basestring):
+    elif isinstance(lookfor, str):
         if lookfor in groupNameMap:
             id = groupNameMap[lookfor]
             if eager is None:
@@ -111,78 +169,95 @@ 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(
-    elif isinstance(lookfor, basestring):
+                    Category.ID == lookfor).first()
+    elif isinstance(lookfor, str):
         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(
-    elif isinstance(lookfor, basestring):
+                    MetaGroup.ID == lookfor).first()
+    elif isinstance(lookfor, str):
         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):
         filter = Category.ID == filter
-    elif isinstance(filter, basestring):
+    elif isinstance(filter, str):
         filter = Category.name == filter
     else:
         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):
-    if not isinstance(nameLike, basestring):
+    if not isinstance(nameLike, str):
         raise TypeError("Need string as argument")
 
     if join is None:
@@ -193,13 +268,33 @@ 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))
+        token_safe = "%{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(3, "where", "nameLike", "join")
+def searchSkills(nameLike, where=None, eager=None):
+    if not isinstance(nameLike, str):
+        raise TypeError("Need string as argument")
+
+    items = gamedata_session.query(Item).options(*processEager(eager)).join(Item.group, Group.category)
+    for token in nameLike.split(' '):
+        token_safe = "%{0}%".format(sqlizeString(token))
+        if where is not None:
+            items = items.filter(and_(Item.name.like(token_safe, escape="\\"), Category.ID == 16, where))
+        else:
+            items = items.filter(and_(Item.name.like(token_safe, escape="\\"), Category.ID == 16))
+    items = items.limit(100).all()
+    return items
+
+
 @cachedQuery(2, "where", "itemids")
-def getVariations(itemids, where=None, eager=None):
+def getVariations(itemids, groupIDs=None, where=None, eager=None):
     for itemid in itemids:
         if not isinstance(itemid, int):
             raise TypeError("All passed item IDs must be integers")
@@ -210,12 +305,24 @@ 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()
+
+    if vars:
+        return vars
+    elif groupIDs:
+        itemfilter = or_(*(groups_table.c.groupID == groupID for groupID in groupIDs))
+        filter = processWhere(itemfilter, where)
+        joinon = items_table.c.groupID == groups_table.c.groupID
+        vars = gamedata_session.query(Item).options(*processEager(eager)).join((groups_table, joinon)).filter(
+                filter).all()
+
     return vars
 
+
 @cachedQuery(1, "attr")
 def getAttributeInfo(attr, eager=None):
-    if isinstance(attr, basestring):
+    if isinstance(attr, str):
         filter = AttributeInfo.name == attr
     elif isinstance(attr, int):
         filter = AttributeInfo.ID == attr
@@ -227,14 +334,16 @@ def getAttributeInfo(attr, eager=None):
         result = None
     return result
 
+
 @cachedQuery(1, "field")
 def getMetaData(field):
-    if isinstance(field, basestring):
+    if isinstance(field, str):
         data = gamedata_session.query(MetaData).get(field)
     else:
         raise TypeError("Need string as argument")
     return data
 
+
 @cachedQuery(2, "itemIDs", "attributeID")
 def directAttributeRequest(itemIDs, attrIDs):
     for itemID in itemIDs:
@@ -244,9 +353,31 @@ 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),
+    q = select((Item.typeID, Attribute.attributeID, Attribute.value),
-                                  and_(eos.types.Attribute.attributeID.in_(attrIDs), eos.types.Item.typeID.in_(itemIDs)),
+               and_(Attribute.attributeID.in_(attrIDs), Item.typeID.in_(itemIDs)),
-                                  from_obj=[join(eos.types.Attribute, eos.types.Item)])
+               from_obj=[join(Attribute, Item)])
 
     result = gamedata_session.execute(q).fetchall()
     return result
+
+
+def getRequiredFor(itemID, attrMapping):
+    Attribute1 = aliased(Attribute)
+    Attribute2 = aliased(Attribute)
+
+    skillToLevelClauses = []
+
+    for attrSkill, attrLevel in attrMapping.items():
+        skillToLevelClauses.append(and_(Attribute1.attributeID == attrSkill, Attribute2.attributeID == attrLevel))
+
+    queryOr = or_(*skillToLevelClauses)
+
+    q = select((Attribute2.typeID, Attribute2.value),
+               and_(Attribute1.value == itemID, queryOr),
+               from_obj=[
+                   join(Attribute1, Attribute2, Attribute1.typeID == Attribute2.typeID)
+               ])
+
+    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.gamedata 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,19 +15,21 @@
 #
 # 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
 
 from eos.db import gamedata_meta
-from eos.types import Unit
+from eos.gamedata 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"),
+       properties={
-                     "name" : synonym("unitName")})
+           "ID"  : synonym("unitID"),
+           "name": synonym("unitName")
+        })

eos/db/migration.py

@@ -1,17 +1,22 @@
-import config
+from logbook import Logger
 import shutil
 import time
-import re
+
-import os
+import config
-import migrations
+from . import migrations
+
+pyfalog = Logger(__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()
@@ -21,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,
@@ -29,12 +34,11 @@ def update(saveddata_engine):
 
         shutil.copyfile(config.saveDB, toFile)
 
-        for version in xrange(dbVersion, appVersion):
+        for version in range(dbVersion, appVersion):
-
+            func = migrations.updates[version + 1]
-            func = migrations.updates[version+1]
             if func:
-                print "applying update",version+1
+                pyfalog.info("Applying database update: {0}", version + 1)
                 func(saveddata_engine)
 
         # when all is said and done, set version to current
-        # saveddata_engine.execute("PRAGMA user_version = {}".format(appVersion))
+        saveddata_engine.execute("PRAGMA user_version = {}".format(appVersion))

eos/db/migrations/__init__.py

@@ -11,12 +11,31 @@ upgrade files 1-5)
 import pkgutil
 import re
 
-
 updates = {}
 appVersion = 0
 
 prefix = __name__ + "."
-for importer, modname, ispkg in pkgutil.iter_modules(__path__, prefix):
+
+# load modules to work based with and without pyinstaller
+# from: https://github.com/webcomics/dosage/blob/master/dosagelib/loader.py
+# see: https://github.com/pyinstaller/pyinstaller/issues/1905
+
+# load modules using iter_modules()
+# (should find all filters in normal build, but not pyinstaller)
+module_names = [m[1] for m in pkgutil.iter_modules(__path__, prefix)]
+
+# special handling for PyInstaller
+importers = map(pkgutil.get_importer, __path__)
+toc = set()
+for i in importers:
+    if hasattr(i, 'toc'):
+        toc |= i.toc
+
+for elm in toc:
+    if elm.startswith(prefix):
+        module_names.append(elm)
+
+for modname in module_names:
     # loop through python files, extracting update number and function, and
     # adding it to a list
     modname_tail = modname.rsplit('.', 1)[-1]

eos/db/migrations/upgrade1.py

@@ -14,50 +14,50 @@ Migration 1
 import sqlalchemy
 
 CONVERSIONS = {
-    6135: [  # Scoped Cargo Scanner
+    6135 : [  # Scoped Cargo Scanner
         6133,  # Interior Type-E Cargo Identifier
     ],
-    6527: [  # Compact Ship Scanner
+    6527 : [  # Compact Ship Scanner
         6525,  # Ta3 Perfunctory Vessel Probe
         6529,  # Speculative Ship Identifier I
         6531,  # Practical Type-E Ship Probe
     ],
-    6569: [  # Scoped Survey Scanner
+    6569 : [  # Scoped Survey Scanner
         6567,  # ML-3 Amphilotite Mining Probe
         6571,  # Rock-Scanning Sensor Array I
         6573,  # 'Dactyl' Type-E Asteroid Analyzer
     ],
-    509: [  # 'Basic' Capacitor Flux Coil
+    509  : [  # 'Basic' Capacitor Flux Coil
         8163,  # Partial Power Plant Manager: Capacitor Flux
         8165,  # Alpha Reactor Control: Capacitor Flux
         8167,  # Type-E Power Core Modification: Capacitor Flux
         8169,  # Marked Generator Refitting: Capacitor Flux
     ],
-    8135: [  # Restrained Capacitor Flux Coil
+    8135 : [  # Restrained Capacitor Flux Coil
         8131,  # Local Power Plant Manager: Capacitor Flux I
     ],
-    8133: [  # Compact Capacitor Flux Coil
+    8133 : [  # Compact Capacitor Flux Coil
         8137,  # Mark I Generator Refitting: Capacitor Flux
     ],
-    3469: [  # Basic Co-Processor
+    3469 : [  # Basic Co-Processor
         8744,  # Nanoelectrical Co-Processor
         8743,  # Nanomechanical CPU Enhancer
         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
+    8748 : [  # Upgraded Co-Processor
         8747,  # Nanomechanical CPU Enhancer I
         8750,  # Quantum Co-Processor I
         8749,  # Photonic CPU Enhancer I
     ],
-    1351: [  # Basic Reactor Control Unit
+    1351 : [  # Basic Reactor Control Unit
         8251,  # Partial Power Plant Manager: Reaction Control
         8253,  # Alpha Reactor Control: Reaction Control
         8257,  # Marked Generator Refitting: Reaction Control
     ],
-    8263: [  # Compact Reactor Control Unit
+    8263 : [  # Compact Reactor Control Unit
         8259,  # Local Power Plant Manager: Reaction Control I
         8265,  # Mark I Generator Refitting: Reaction Control
         8261,  # Beta Reactor Control: Reaction Control I
@@ -69,19 +69,20 @@ CONVERSIONS = {
     31936: [  # Navy Micro Auxiliary Power Core
         16543,  # Micro 'Vigor' Core Augmentation
     ],
-    8089: [  # Compact Light Missile Launcher
+    8089 : [  # Compact Light Missile Launcher
-       8093,  # Prototype 'Arbalest' Light Missile Launcher
+        8093,  # Prototype 'Arbalest' Light Missile Launcher
     ],
-    8091: [  # Ample Light Missile Launcher
+    8091 : [  # Ample Light Missile Launcher
         7993,  # Experimental TE-2100 Light Missile Launcher
     ],
     # Surface Cargo Scanner I was removed from game, however no mention of
     # replacement module in patch notes. Morphing it to meta 0 module to be safe
-    442: [  # Cargo Scanner I
+    442  : [  # Cargo Scanner I
         6129,  # Surface Cargo Scanner I
     ]
 }
 
+
 def upgrade(saveddata_engine):
     # Update fits schema to include target resists attribute
     try:
@@ -90,8 +91,9 @@ def upgrade(saveddata_engine):
         saveddata_engine.execute("ALTER TABLE fits ADD COLUMN targetResistsID INTEGER;")
 
     # Convert modules
-    for replacement_item, list in CONVERSIONS.iteritems():
+    for replacement_item, list in CONVERSIONS.items():
         for retired_item in list:
-            saveddata_engine.execute('UPDATE "modules" SET "itemID" = ? WHERE "itemID" = ?', (replacement_item, retired_item))
+            saveddata_engine.execute('UPDATE "modules" SET "itemID" = ? WHERE "itemID" = ?',
-            saveddata_engine.execute('UPDATE "cargo" SET "itemID" = ? WHERE "itemID" = ?', (replacement_item, retired_item))
+                                     (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
@@ -15,7 +14,7 @@ CONVERSIONS = {
     22947: (  # 'Beatnik' Small Remote Armor Repairer
         23414,  # 'Brotherhood' Small Remote Armor Repairer
     ),
-    8295: (  # Type-D Restrained Shield Flux Coil
+    8295 : (  # Type-D Restrained Shield Flux Coil
         8293,  # Beta Reactor Control: Shield Flux I
     ),
     16499: (  # Heavy Knave Scoped Energy Nosferatu
@@ -30,13 +29,13 @@ CONVERSIONS = {
     16447: (  # Medium Solace Scoped Remote Armor Repairer
         16445,  # Medium 'Arup' Remote Armor Repairer
     ),
-    508: (  # 'Basic' Shield Flux Coil
+    508  : (  # 'Basic' Shield Flux Coil
         8325,  # Alpha Reactor Shield Flux
         8329,  # Marked Generator Refitting: Shield Flux
         8323,  # Partial Power Plant Manager: Shield Flux
         8327,  # Type-E Power Core Modification: Shield Flux
     ),
-    1419: (  # 'Basic' Shield Power Relay
+    1419 : (  # 'Basic' Shield Power Relay
         8341,  # Alpha Reactor Shield Power Relay
         8345,  # Marked Generator Refitting: Shield Power Relay
         8339,  # Partial Power Plant Manager: Shield Power Relay
@@ -48,57 +47,57 @@ CONVERSIONS = {
     16505: (  # Medium Ghoul Compact Energy Nosferatu
         16511,  # Medium Diminishing Power System Drain I
     ),
-    8297: (  # Mark I Compact Shield Flux Coil
+    8297 : (  # Mark I Compact Shield Flux Coil
         8291,  # Local Power Plant Manager: Reaction Shield Flux I
     ),
     16455: (  # Large Solace Scoped Remote Armor Repairer
         16453,  # Large 'Arup' Remote Armor Repairer
     ),
-    6485: (  # M51 Benefactor Compact Shield Recharger
+    6485 : (  # M51 Benefactor Compact Shield Recharger
         6491,  # Passive Barrier Compensator I
         6489,  # 'Benefactor' Ward Reconstructor
         6487,  # Supplemental Screen Generator I
     ),
-    5137: (  # Small Knave Scoped Energy Nosferatu
+    5137 : (  # Small Knave Scoped Energy Nosferatu
         5135,  # E5 Prototype Energy Vampire
     ),
-    8579: (  # Medium Murky Compact Remote Shield Booster
+    8579 : (  # Medium Murky Compact Remote Shield Booster
         8581,  # Medium 'Atonement' Remote Shield Booster
     ),
-    8531: (  # Small Murky Compact Remote Shield Booster
+    8531 : (  # Small Murky Compact Remote Shield Booster
         8533,  # Small 'Atonement' Remote Shield Booster
     ),
     16497: (  # Heavy Ghoul Compact Energy Nosferatu
         16503,  # Heavy Diminishing Power System Drain I
     ),
-    4477: (  # Small Gremlin Compact Energy Neutralizer
+    4477 : (  # Small Gremlin Compact Energy Neutralizer
         4475,  # Small Unstable Power Fluctuator I
     ),
-    8337: (  # Mark I Compact Shield Power Relay
+    8337 : (  # Mark I Compact Shield Power Relay
         8331,  # Local Power Plant Manager: Reaction Shield Power Relay I
     ),
     23416: (  # 'Peace' Large Remote Armor Repairer
         22951,  # 'Pacifier' Large Remote Armor Repairer
     ),
-    5141: (  # Small Ghoul Compact Energy Nosferatu
+    5141 : (  # Small Ghoul Compact Energy Nosferatu
         5139,  # Small Diminishing Power System Drain I
     ),
-    4471: (  # Small Infectious Scoped Energy Neutralizer
+    4471 : (  # Small Infectious Scoped Energy Neutralizer
         4473,  # Small Rudimentary Energy Destabilizer I
     ),
     16469: (  # Medium Infectious Scoped Energy Neutralizer
         16465,  # Medium Rudimentary Energy Destabilizer I
     ),
-    8335: (  # Type-D Restrained Shield Power Relay
+    8335 : (  # Type-D Restrained Shield Power Relay
         8333,  # Beta Reactor Control: Shield Power Relay I
     ),
-    405: (  # 'Micro' Remote Shield Booster
+    405  : (  # 'Micro' Remote Shield Booster
         8631,  # Micro Asymmetric Remote Shield Booster
         8627,  # Micro Murky Remote Shield Booster
         8629,  # Micro 'Atonement' Remote Shield Booster
         8633,  # Micro S95a Remote Shield Booster
     ),
-    8635: (  # Large Murky Compact Remote Shield Booster
+    8635 : (  # Large Murky Compact Remote Shield Booster
         8637,  # Large 'Atonement' Remote Shield Booster
     ),
     16507: (  # Medium Knave Scoped Energy Nosferatu
@@ -106,11 +105,12 @@ CONVERSIONS = {
     ),
 }
 
+
 def upgrade(saveddata_engine):
-
     # Convert modules
-    for replacement_item, list in CONVERSIONS.iteritems():
+    for replacement_item, list in CONVERSIONS.items():
         for retired_item in list:
-            saveddata_engine.execute('UPDATE "modules" SET "itemID" = ? WHERE "itemID" = ?', (replacement_item, retired_item))
+            saveddata_engine.execute('UPDATE "modules" SET "itemID" = ? WHERE "itemID" = ?',
-            saveddata_engine.execute('UPDATE "cargo" SET "itemID" = ? WHERE "itemID" = ?', (replacement_item, retired_item))
+                                     (replacement_item, retired_item))
-
+            saveddata_engine.execute('UPDATE "cargo" SET "itemID" = ? WHERE "itemID" = ?',
+                                     (replacement_item, retired_item))

eos/db/migrations/upgrade12.py

@@ -7,33 +7,32 @@ Migration 12
     modules with their new replacements
 """
 
-
 CONVERSIONS = {
     16457: (  # Crosslink Compact Ballistic Control System
         16459,  # Muon Coil Bolt Array I
         16461,  # Multiphasic Bolt Array I
         16463,  # 'Pandemonium' Ballistic Enhancement
     ),
-    5281: (  # Coadjunct Scoped Remote Sensor Booster
+    5281 : (  # Coadjunct Scoped Remote Sensor Booster
         7218,  # Piercing ECCM Emitter I
     ),
-    5365: (  # Cetus Scoped Burst Jammer
+    5365 : (  # Cetus Scoped Burst Jammer
         5359,  # 1Z-3 Subversive ECM Eruption
     ),
-    1973: (  # Sensor Booster I
+    1973 : (  # Sensor Booster I
         1947,  # ECCM - Radar I
         2002,  # ECCM - Ladar I
         2003,  # ECCM - Magnetometric I
         2004,  # ECCM - Gravimetric I
         2005,  # ECCM - Omni I
     ),
-    1951: (  # 'Basic' Tracking Enhancer
+    1951 : (  # 'Basic' Tracking Enhancer
         6322,  # Beta-Nought Tracking Mode
         6323,  # Azimuth Descalloping Tracking Enhancer
         6324,  # F-AQ Delay-Line Scan Tracking Subroutines
         6321,  # Beam Parallax Tracking Program
     ),
-    521: (  # 'Basic' Damage Control
+    521  : (  # 'Basic' Damage Control
         5829,  # GLFF Containment Field
         5831,  # Interior Force Field Array
         5835,  # F84 Local Damage System
@@ -43,13 +42,13 @@ CONVERSIONS = {
         22939,  # 'Boss' Remote Sensor Booster
         22941,  # 'Entrepreneur' Remote Sensor Booster
     ),
-    5443: (  # Faint Epsilon Scoped Warp Scrambler
+    5443 : (  # Faint Epsilon Scoped Warp Scrambler
         5441,  # Fleeting Progressive Warp Scrambler I
     ),
-    1963: (  # Remote Sensor Booster I
+    1963 : (  # Remote Sensor Booster I
         1959,  # ECCM Projector I
     ),
-    6325: (  # Fourier Compact Tracking Enhancer
+    6325 : (  # Fourier Compact Tracking Enhancer
         6326,  # Sigma-Nought Tracking Mode I
         6327,  # Auto-Gain Control Tracking Enhancer I
         6328,  # F-aQ Phase Code Tracking Subroutines
@@ -69,19 +68,19 @@ CONVERSIONS = {
     22919: (  # 'Monopoly' Magnetic Field Stabilizer
         22917,  # 'Capitalist' Magnetic Field Stabilizer I
     ),
-    5839: (  # IFFA Compact Damage Control
+    5839 : (  # IFFA Compact Damage Control
         5841,  # Emergency Damage Control I
         5843,  # F85 Peripheral Damage System I
         5837,  # Pseudoelectron Containment Field I
     ),
-    522: (  # 'Micro' Cap Battery
+    522  : (  # 'Micro' Cap Battery
         4747,  # Micro Ld-Acid Capacitor Battery I
         4751,  # Micro Ohm Capacitor Reserve I
         4745,  # Micro F-4a Ld-Sulfate Capacitor Charge Unit
         4749,  # Micro Peroxide Capacitor Power Cell
         3480,  # Micro Capacitor Battery II
     ),
-    518: (  # 'Basic' Gyrostabilizer
+    518  : (  # 'Basic' Gyrostabilizer
         5915,  # Lateral Gyrostabilizer
         5919,  # F-M2 Weapon Inertial Suspensor
         5913,  # Hydraulic Stabilization Actuator
@@ -90,19 +89,19 @@ CONVERSIONS = {
     19931: (  # Compulsive Scoped Multispectral ECM
         19933,  # 'Hypnos' Multispectral ECM I
     ),
-    5403: (  # Faint Scoped Warp Disruptor
+    5403 : (  # Faint Scoped Warp Disruptor
         5401,  # Fleeting Warp Disruptor I
     ),
     23902: (  # 'Trebuchet' Heat Sink I
         23900,  # 'Mangonel' Heat Sink I
     ),
-    1893: (  # 'Basic' Heat Sink
+    1893 : (  # 'Basic' Heat Sink
         5845,  # Heat Exhaust System
         5856,  # C3S Convection Thermal Radiator
         5855,  # 'Boreas' Coolant System
         5854,  # Stamped Heat Sink
     ),
-    6160: (  # F-90 Compact Sensor Booster
+    6160 : (  # F-90 Compact Sensor Booster
         20214,  # Extra Radar ECCM Scanning Array I
         20220,  # Extra Ladar ECCM Scanning Array I
         20226,  # Extra Gravimetric ECCM Scanning Array I
@@ -124,40 +123,40 @@ CONVERSIONS = {
     19952: (  # Umbra Scoped Radar ECM
         9520,  # 'Penumbra' White Noise ECM
     ),
-    1952: (  # Sensor Booster II
+    1952 : (  # Sensor Booster II
         2258,  # ECCM - Omni II
         2259,  # ECCM - Gravimetric II
         2260,  # ECCM - Ladar II
         2261,  # ECCM - Magnetometric II
         2262,  # ECCM - Radar II
     ),
-    5282: (  # Linked Enduring Sensor Booster
+    5282 : (  # Linked Enduring Sensor Booster
         7219,  # Scattering ECCM Projector I
     ),
-    1986: (  # Signal Amplifier I
+    1986 : (  # Signal Amplifier I
         2579,  # Gravimetric Backup Array I
         2583,  # Ladar Backup Array I
         2587,  # Magnetometric Backup Array I
         2591,  # Multi Sensor Backup Array I
         4013,  # RADAR Backup Array I
     ),
-    4871: (  # Large Compact Pb-Acid Cap Battery
+    4871 : (  # Large Compact Pb-Acid Cap Battery
         4875,  # Large Ohm Capacitor Reserve I
         4869,  # Large F-4a Ld-Sulfate Capacitor Charge Unit
         4873,  # Large Peroxide Capacitor Power Cell
     ),
-    1964: (  # Remote Sensor Booster II
+    1964 : (  # Remote Sensor Booster II
         1960,  # ECCM Projector II
     ),
-    5933: (  # Counterbalanced Compact Gyrostabilizer
+    5933 : (  # Counterbalanced Compact Gyrostabilizer
         5931,  # Cross-Lateral Gyrostabilizer I
         5935,  # F-M3 Munition Inertial Suspensor
         5929,  # Pneumatic Stabilization Actuator I
     ),
-    4025: (  # X5 Enduring Stasis Webifier
+    4025 : (  # X5 Enduring Stasis Webifier
         4029,  # 'Langour' Drive Disruptor I
     ),
-    4027: (  # Fleeting Compact Stasis Webifier
+    4027 : (  # Fleeting Compact Stasis Webifier
         4031,  # Patterned Stasis Web I
     ),
     22937: (  # 'Enterprise' Remote Tracking Computer
@@ -166,7 +165,7 @@ CONVERSIONS = {
     22929: (  # 'Marketeer' Tracking Computer
         22927,  # 'Economist' Tracking Computer I
     ),
-    1987: (  # Signal Amplifier II
+    1987 : (  # Signal Amplifier II
         2580,  # Gravimetric Backup Array II
         2584,  # Ladar Backup Array II
         2588,  # Magnetometric Backup Array II
@@ -176,13 +175,13 @@ CONVERSIONS = {
     19939: (  # Enfeebling Scoped Ladar ECM
         9522,  # Faint Phase Inversion ECM I
     ),
-    5340: (  # P-S Compact Remote Tracking Computer
+    5340 : (  # P-S Compact Remote Tracking Computer
         5341,  # 'Prayer' Remote Tracking Computer
     ),
     19814: (  # Phased Scoped Target Painter
         19808,  # Partial Weapon Navigation
     ),
-    1949: (  # 'Basic' Signal Amplifier
+    1949 : (  # 'Basic' Signal Amplifier
         1946,  # Basic RADAR Backup Array
         1982,  # Basic Ladar Backup Array
         1983,  # Basic Gravimetric Backup Array
@@ -223,10 +222,10 @@ CONVERSIONS = {
     23416: (  # 'Peace' Large Remote Armor Repairer
         None,  # 'Pacifier' Large Remote Armor Repairer
     ),
-    6176: (  # F-12 Enduring Tracking Computer
+    6176 : (  # F-12 Enduring Tracking Computer
         6174,  # Monopulse Tracking Mechanism I
     ),
-    6159: (  # Alumel-Wired Enduring Sensor Booster
+    6159 : (  # Alumel-Wired Enduring Sensor Booster
         7917,  # Alumel Radar ECCM Sensor Array I
         7918,  # Alumel Ladar ECCM Sensor Array I
         7922,  # Alumel Gravimetric ECCM Sensor Array I
@@ -248,7 +247,7 @@ CONVERSIONS = {
         7914,  # Prototype ECCM Magnetometric Sensor Cluster
         6158,  # Prototype Sensor Booster
     ),
-    5849: (  # Extruded Compact Heat Sink
+    5849 : (  # Extruded Compact Heat Sink
         5846,  # Thermal Exhaust System I
         5858,  # C4S Coiled Circuit Thermal Radiator
         5857,  # 'Skadi' Coolant System I
@@ -264,15 +263,15 @@ CONVERSIONS = {
     22945: (  # 'Executive' Remote Sensor Dampener
         22943,  # 'Broker' Remote Sensor Dampener I
     ),
-    6173: (  # Optical Compact Tracking Computer
+    6173 : (  # Optical Compact Tracking Computer
         6175,  # 'Orion' Tracking CPU I
     ),
-    5279: (  # F-23 Compact Remote Sensor Booster
+    5279 : (  # F-23 Compact Remote Sensor Booster
         7217,  # Spot Pulsing ECCM I
         7220,  # Phased Muon ECCM Caster I
         5280,  # Connected Remote Sensor Booster
     ),
-    4787: (  # Small Compact Pb-Acid Cap Battery
+    4787 : (  # Small Compact Pb-Acid Cap Battery
         4791,  # Small Ohm Capacitor Reserve I
         4785,  # Small F-4a Ld-Sulfate Capacitor Charge Unit
         4789,  # Small Peroxide Capacitor Power Cell
@@ -280,7 +279,7 @@ CONVERSIONS = {
     19946: (  # BZ-5 Scoped Gravimetric ECM
         9519,  # FZ-3 Subversive Spatial Destabilizer ECM
     ),
-    6073: (  # Medium Compact Pb-Acid Cap Battery
+    6073 : (  # Medium Compact Pb-Acid Cap Battery
         6097,  # Medium Ohm Capacitor Reserve I
         6111,  # Medium F-4a Ld-Sulfate Capacitor Charge Unit
         6083,  # Medium Peroxide Capacitor Power Cell
@@ -288,7 +287,7 @@ CONVERSIONS = {
     21484: (  # 'Full Duplex' Ballistic Control System
         21482,  # Ballistic 'Purge' Targeting System I
     ),
-    6296: (  # F-89 Compact Signal Amplifier
+    6296 : (  # F-89 Compact Signal Amplifier
         6218,  # Protected Gravimetric Backup Cluster I
         6222,  # Protected Ladar Backup Cluster I
         6226,  # Protected Magnetometric Backup Cluster I
@@ -325,16 +324,17 @@ CONVERSIONS = {
         6293,  # Wavelength Signal Enhancer I
         6295,  # Type-D Attenuation Signal Augmentation
     ),
-    5302: (  # Phased Muon Scoped Sensor Dampener
+    5302 : (  # Phased Muon Scoped Sensor Dampener
         5300,  # Indirect Scanning Dampening Unit I
     ),
 }
 
+
 def upgrade(saveddata_engine):
-
     # Convert modules
-    for replacement_item, list in CONVERSIONS.iteritems():
+    for replacement_item, list in CONVERSIONS.items():
         for retired_item in list:
-            saveddata_engine.execute('UPDATE "modules" SET "itemID" = ? WHERE "itemID" = ?', (replacement_item, retired_item))
+            saveddata_engine.execute('UPDATE "modules" SET "itemID" = ? WHERE "itemID" = ?',
-            saveddata_engine.execute('UPDATE "cargo" SET "itemID" = ? WHERE "itemID" = ?', (replacement_item, retired_item))
+                                     (replacement_item, retired_item))
-
+            saveddata_engine.execute('UPDATE "cargo" SET "itemID" = ? WHERE "itemID" = ?',
+                                     (replacement_item, retired_item))

eos/db/migrations/upgrade13.py

@@ -0,0 +1,16 @@
+"""
+Migration 13
+
+- Alters fits table to introduce implant location attribute
+"""
+
+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")

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,19 @@
+"""
+Migration 15
+
+- Delete projected modules on citadels
+"""
+
+
+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,42 @@
+"""
+Migration 17
+
+- Moves all fleet boosters to the new schema
+"""
+
+
+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
+          """
+    try:
+        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()
+    except:
+        # Shouldn't fail unless you have updated database without the old fleet schema and manually modify the database version
+        # If it does, simply fail. Fleet data migration isn't critically important here
+        pass

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.items():
+        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,18 @@
+"""
+Migration 19
+
+- Deletes broken references to fits from the commandFits table (see GH issue #844)
+"""
+
+
+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/upgrade21.py

@@ -0,0 +1,10 @@
+"""
+Migration 21
+
+- Fixes discrepancy in drone table where we may have an amount active that is not equal to the amount in the stack
+  (we don't support activating only 2/5 drones). See GH issue #728
+"""
+
+
+def upgrade(saveddata_engine):
+    saveddata_engine.execute("UPDATE drones SET amountActive = amount where amountActive > 0 AND amountActive <> amount;")

eos/db/migrations/upgrade22.py

@@ -0,0 +1,45 @@
+"""
+Migration 22
+
+- Adds the created and modified fields to most tables
+"""
+import sqlalchemy
+
+
+def upgrade(saveddata_engine):
+
+    # 1 = created only
+    # 2 = created and modified
+    tables = {
+        "boosters": 2,
+        "cargo": 2,
+        "characters": 2,
+        "crest": 1,
+        "damagePatterns": 2,
+        "drones": 2,
+        "fighters": 2,
+        "fits": 2,
+        "projectedFits": 2,
+        "commandFits": 2,
+        "implants": 2,
+        "implantSets": 2,
+        "modules": 2,
+        "overrides": 2,
+        "characterSkills": 2,
+        "targetResists": 2
+    }
+
+    for table in list(tables.keys()):
+
+        # midnight brain, there's probably a much more simple way to do this, but fuck it
+        if tables[table] > 0:
+            try:
+                saveddata_engine.execute("SELECT created FROM {0} LIMIT 1;".format(table))
+            except sqlalchemy.exc.DatabaseError:
+                saveddata_engine.execute("ALTER TABLE {} ADD COLUMN created DATETIME;".format(table))
+
+        if tables[table] > 1:
+            try:
+                saveddata_engine.execute("SELECT modified FROM {0} LIMIT 1;".format(table))
+            except sqlalchemy.exc.DatabaseError:
+                saveddata_engine.execute("ALTER TABLE {} ADD COLUMN modified DATETIME;".format(table))

eos/db/migrations/upgrade23.py

@@ -0,0 +1,13 @@
+"""
+Migration 23
+
+- Adds a sec status field to the character table
+"""
+import sqlalchemy
+
+
+def upgrade(saveddata_engine):
+    try:
+        saveddata_engine.execute("SELECT secStatus FROM characters LIMIT 1")
+    except sqlalchemy.exc.DatabaseError:
+        saveddata_engine.execute("ALTER TABLE characters ADD COLUMN secStatus FLOAT;")

eos/db/migrations/upgrade24.py

@@ -0,0 +1,14 @@
+"""
+Migration 24
+
+- Adds a boolean value to fit to signify if fit should ignore restrictions
+"""
+import sqlalchemy
+
+
+def upgrade(saveddata_engine):
+    try:
+        saveddata_engine.execute("SELECT ignoreRestrictions FROM fits LIMIT 1")
+    except sqlalchemy.exc.DatabaseError:
+        saveddata_engine.execute("ALTER TABLE fits ADD COLUMN ignoreRestrictions BOOLEAN")
+        saveddata_engine.execute("UPDATE fits SET ignoreRestrictions = 0")

eos/db/migrations/upgrade26.py

@@ -0,0 +1,9 @@
+"""
+Migration 26
+
+- Deletes invalid command fit relationships caused by a bug (see #1244)
+"""
+
+
+def upgrade(saveddata_engine):
+    saveddata_engine.execute("DELETE FROM commandFits WHERE boosterID NOT IN (SELECT ID FROM fits) OR boostedID NOT IN (SELECT ID FROM fits)")

eos/db/migrations/upgrade27.py

@@ -0,0 +1,9 @@
+"""
+Migration 27
+
+- Resets all alpha clones to 1 (CCP consolidated all alpha's into one skillset)
+"""
+
+
+def upgrade(saveddata_engine):
+    saveddata_engine.execute("UPDATE characters SET alphaCloneID = 1 WHERE alphaCloneID IS NOT NULL")

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,66 +10,65 @@ Migration 4
     and output of itemDiff.py
 """
 
-
 CONVERSIONS = {
-    506: (  # 'Basic' Capacitor Power Relay
+    506  : (  # 'Basic' Capacitor Power Relay
         8205,  # Alpha Reactor Control: Capacitor Power Relay
         8209,  # Marked Generator Refitting: Capacitor Power Relay
         8203,  # Partial Power Plant Manager: Capacity Power Relay
         8207,  # Type-E Power Core Modification: Capacitor Power Relay
     ),
-    8177: (  # Mark I Compact Capacitor Power Relay
+    8177 : (  # Mark I Compact Capacitor Power Relay
         8173,  # Beta Reactor Control: Capacitor Power Relay I
     ),
-    8175: (  # Type-D Restrained Capacitor Power Relay
+    8175 : (  # Type-D Restrained Capacitor Power Relay
         8171,  # Local Power Plant Manager: Capacity Power Relay I
     ),
 
-    421: (  # 'Basic' Capacitor Recharger
+    421  : (  # 'Basic' Capacitor Recharger
         4425,  # AGM Capacitor Charge Array,
         4421,  # F-a10 Buffer Capacitor Regenerator
         4423,  # Industrial Capacitor Recharger
         4427,  # Secondary Parallel Link-Capacitor
     ),
-    4435: (  # Eutectic Compact Cap Recharger
+    4435 : (  # Eutectic Compact Cap Recharger
         4433,  # Barton Reactor Capacitor Recharger I
         4431,  # F-b10 Nominal Capacitor Regenerator
         4437,  # Fixed Parallel Link-Capacitor I
     ),
 
-    1315: (  # 'Basic' Expanded Cargohold
+    1315 : (  # 'Basic' Expanded Cargohold
         5483,  # Alpha Hull Mod Expanded Cargo
         5479,  # Marked Modified SS Expanded Cargo
         5481,  # Partial Hull Conversion Expanded Cargo
         5485,  # Type-E Altered SS Expanded Cargo
     ),
-    5493: (  # Type-D Restrained Expanded Cargo
+    5493 : (  # Type-D Restrained Expanded Cargo
         5491,  # Beta Hull Mod Expanded Cargo
         5489,  # Local Hull Conversion Expanded Cargo I
         5487,  # Mark I Modified SS Expanded Cargo
     ),
 
-    1401: (  # 'Basic' Inertial Stabilizers
+    1401 : (  # 'Basic' Inertial Stabilizers
         5523,  # Alpha Hull Mod Inertial Stabilizers
         5521,  # Partial Hull Conversion Inertial Stabilizers
         5525,  # Type-E Altered SS Inertial Stabilizers
     ),
-    5533: (  # Type-D Restrained Inertial Stabilizers
+    5533 : (  # Type-D Restrained Inertial Stabilizers
         5531,  # Beta Hull Mod Inertial Stabilizers
         5529,  # Local Hull Conversion Inertial Stabilizers I
         5527,  # Mark I Modified SS Inertial Stabilizers
         5519,  # Marked Modified SS Inertial Stabilizers
     ),
 
-    5239: (  # EP-S Gaussian Scoped Mining Laser
+    5239 : (  # EP-S Gaussian Scoped Mining Laser
         5241,  # Dual Diode Mining Laser I
     ),
-    5233: (  # Single Diode Basic Mining Laser
+    5233 : (  # Single Diode Basic Mining Laser
         5231,  # EP-R Argon Ion Basic Excavation Pulse
         5237,  # Rubin Basic Particle Bore Stream
         5235,  # Xenon Basic Drilling Beam
     ),
-    5245: (  # Particle Bore Compact Mining Laser
+    5245 : (  # Particle Bore Compact Mining Laser
         5243,  # XeCl Drilling Beam I
     ),
 
@@ -80,62 +79,63 @@ CONVERSIONS = {
         22609,  # Erin Mining Laser Upgrade
     ),
 
-    1242: (  # 'Basic' Nanofiber Internal Structure
+    1242 : (  # 'Basic' Nanofiber Internal Structure
         5591,  # Alpha Hull Mod Nanofiber Structure
         5595,  # Marked Modified SS Nanofiber Structure
         5559,  # Partial Hull Conversion Nanofiber Structure
         5593,  # Type-E Altered SS Nanofiber Structure
     ),
-    5599: (  # Type-D Restrained Nanofiber Structure
+    5599 : (  # Type-D Restrained Nanofiber Structure
         5597,  # Beta Hull Mod Nanofiber Structure
         5561,  # Local Hull Conversion Nanofiber Structure I
         5601,  # Mark I Modified SS Nanofiber Structure
     ),
 
-    1192: (  # 'Basic' Overdrive Injector System
+    1192 : (  # 'Basic' Overdrive Injector System
         5613,  # Alpha Hull Mod Overdrive Injector
         5617,  # Marked Modified SS Overdrive Injector
         5611,  # Partial Hull Conversion Overdrive Injector
         5615,  # Type-E Altered SS Overdrive Injector
     ),
-    5631: (  # Type-D Restrained Overdrive Injector
+    5631 : (  # Type-D Restrained Overdrive Injector
         5629,  # Beta Hull Mod Overdrive Injector
         5627,  # Local Hull Conversion Overdrive Injector I
         5633,  # Mark I Modified SS Overdrive Injector
     ),
 
-    1537: (  # 'Basic' Power Diagnostic System
+    1537 : (  # 'Basic' Power Diagnostic System
         8213,  # Alpha Reactor Control: Diagnostic System
         8217,  # Marked Generator Refitting: Diagnostic System
         8211,  # Partial Power Plant Manager: Diagnostic System
         8215,  # Type-E Power Core Modification: Diagnostic System
         8255,  # Type-E Power Core Modification: Reaction Control
     ),
-    8225: (  # Mark I Compact Power Diagnostic System
+    8225 : (  # Mark I Compact Power Diagnostic System
         8221,  # Beta Reactor Control: Diagnostic System I
         8219,  # Local Power Plant Manager: Diagnostic System I
         8223,  # Type-D Power Core Modification: Diagnostic System
     ),
 
-    1240: (  # 'Basic' Reinforced Bulkheads
+    1240 : (  # 'Basic' Reinforced Bulkheads
         5677,  # Alpha Hull Mod Reinforced Bulkheads
         5681,  # Marked Modified SS Reinforced Bulkheads
         5675,  # Partial Hull Conversion Reinforced Bulkheads
         5679,  # Type-E Altered SS Reinforced Bulkheads
     ),
-    5649: (  # Mark I Compact Reinforced Bulkheads
+    5649 : (  # Mark I Compact Reinforced Bulkheads
         5645,  # Beta Hull Mod Reinforced Bulkheads
     ),
-    5647: (  # Type-D Restrained Reinforced Bulkheads
+    5647 : (  # Type-D Restrained Reinforced Bulkheads
         5643,  # Local Hull Conversion Reinforced Bulkheads I
     ),
 }
 
+
 def upgrade(saveddata_engine):
-
     # Convert modules
-    for replacement_item, list in CONVERSIONS.iteritems():
+    for replacement_item, list in CONVERSIONS.items():
         for retired_item in list:
-            saveddata_engine.execute('UPDATE "modules" SET "itemID" = ? WHERE "itemID" = ?', (replacement_item, retired_item))
+            saveddata_engine.execute('UPDATE "modules" SET "itemID" = ? WHERE "itemID" = ?',
-            saveddata_engine.execute('UPDATE "cargo" SET "itemID" = ? WHERE "itemID" = ?', (replacement_item, retired_item))
+                                     (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 (ID, name, emAmount, thermalAmount, kineticAmount, explosiveAmount, ownerID) 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):
-
     # Convert ships
-    for replacement_item, list in CONVERSIONS.iteritems():
+    for replacement_item, list in CONVERSIONS.items():
         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,18 +7,17 @@ Migration 8
     modules with their new replacements
 """
 
-
 CONVERSIONS = {
-    8529: (  # Large F-S9 Regolith Compact Shield Extender
+    8529 : (  # Large F-S9 Regolith Compact Shield Extender
         8409,  # Large Subordinate Screen Stabilizer I
     ),
-    8419: (  # Large Azeotropic Restrained Shield Extender
+    8419 : (  # Large Azeotropic Restrained Shield Extender
         8489,  # Large Supplemental Barrier Emitter I
     ),
-    8517: (  # Medium F-S9 Regolith Compact Shield Extender
+    8517 : (  # Medium F-S9 Regolith Compact Shield Extender
         8397,  # Medium Subordinate Screen Stabilizer I
     ),
-    8433: (  # Medium Azeotropic Restrained Shield Extender
+    8433 : (  # Medium Azeotropic Restrained Shield Extender
         8477,  # Medium Supplemental Barrier Emitter I
     ),
     20627: (  # Small 'Trapper' Shield Extender
@@ -29,10 +28,10 @@ CONVERSIONS = {
         8387,  # Micro Subordinate Screen Stabilizer I
         8465,  # Micro Supplemental Barrier Emitter I
     ),
-    8521: (  # Small F-S9 Regolith Compact Shield Extender
+    8521 : (  # Small F-S9 Regolith Compact Shield Extender
         8401,  # Small Subordinate Screen Stabilizer I
     ),
-    8427: (  # Small Azeotropic Restrained Shield Extender
+    8427 : (  # Small Azeotropic Restrained Shield Extender
         8481,  # Small Supplemental Barrier Emitter I
     ),
     11343: (  # 100mm Crystalline Carbonide Restrained Plates
@@ -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):
-
     # Convert modules
-    for replacement_item, list in CONVERSIONS.iteritems():
+    for replacement_item, list in CONVERSIONS.items():
         for retired_item in list:
-            saveddata_engine.execute('UPDATE "modules" SET "itemID" = ? WHERE "itemID" = ?', (replacement_item, retired_item))
+            saveddata_engine.execute('UPDATE "modules" SET "itemID" = ? WHERE "itemID" = ?',
-            saveddata_engine.execute('UPDATE "cargo" SET "itemID" = ? WHERE "itemID" = ?', (replacement_item, retired_item))
+                                     (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,10 @@ __all__ = [
     "booster",
     "drone",
     "implant",
-    "fleet",
     "damagePattern",
     "miscData",
     "targetResists",
     "override",
-    "crest"
+    "implantSet",
+    "loadDefaultDatabaseValues"
 ]
-

eos/db/saveddata/booster.py

@@ -1,4 +1,4 @@
-#===============================================================================
+# ===============================================================================
 # Copyright (C) 2010 Diego Duclos
 #
 # This file is part of eos.
@@ -15,33 +15,41 @@
 #
 # 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 import Table, Column, ForeignKey, Integer, Boolean, DateTime
 from sqlalchemy.orm import mapper, relation
-from sqlalchemy.ext.associationproxy import association_proxy
+import datetime
 
 from eos.db import saveddata_meta
-from eos.types import Booster
+from eos.saveddata.booster import Booster
+from eos.saveddata.boosterSideEffect import BoosterSideEffect
 
 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),
+                       Column("created", DateTime, nullable=True, default=datetime.datetime.now),
+                       Column("modified", DateTime, nullable=True, onupdate=datetime.datetime.now),
                        )
 
-activeSideEffects_table = Table("boostersActiveSideEffects", saveddata_meta,
-                                Column("boosterID", ForeignKey("boosters.ID"), primary_key = True),
-                                Column("effectID", Integer, primary_key = True))
 
-class ActiveSideEffectsDummy(object):
+booster_side_effect_table = Table("boosterSideEffects", saveddata_meta,
-    def __init__(self, effectID):
+                                  Column("boosterID", Integer, ForeignKey("boosters.ID"), primary_key=True, index=True),
-        self.effectID = effectID
+                                  Column("effectID", Integer, nullable=False, primary_key=True),
+                                  Column("active", Boolean, default=False)
+                                  )
 
 
-mapper(ActiveSideEffectsDummy, activeSideEffects_table)
 mapper(Booster, boosters_table,
-       properties = {"_Booster__activeSideEffectDummies" : relation(ActiveSideEffectsDummy)})
+       properties={
+        "_Booster__sideEffects": relation(
+            BoosterSideEffect,
+            backref="booster",
+            cascade='all, delete, delete-orphan'),
+       }
+       )
 
-Booster._Booster__activeSideEffectIDs = association_proxy("_Booster__activeSideEffectDummies", "effectID")
+
+mapper(BoosterSideEffect, booster_side_effect_table)

eos/db/saveddata/cargo.py

@@ -1,4 +1,4 @@
-#===============================================================================
+# ===============================================================================
 # Copyright (C) 2010 Diego Duclos
 #
 # This file is part of eos.
@@ -15,18 +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, Integer, ForeignKey, Boolean
+from sqlalchemy import Table, Column, Integer, ForeignKey, DateTime
-from sqlalchemy.orm import mapper
+from sqlalchemy.orm import mapper, relation
+import datetime
 
 from eos.db import saveddata_meta
-from eos.types import Cargo
+from eos.saveddata.cargo import Cargo
+from eos.saveddata.fit import Fit
 
 cargo_table = Table("cargo", saveddata_meta,
-                     Column("ID", Integer, primary_key=True),
+                    Column("ID", Integer, primary_key=True),
-                     Column("fitID", Integer, ForeignKey("fits.ID"), nullable = False, index = True),
+                    Column("fitID", Integer, ForeignKey("fits.ID"), nullable=False, index=True),
-                     Column("itemID", Integer, nullable = False),
+                    Column("itemID", Integer, nullable=False),
-                     Column("amount", Integer, nullable = False))
+                    Column("amount", Integer, nullable=False),
+                    Column("created", DateTime, nullable=True, default=datetime.datetime.now),
+                    Column("modified", DateTime, nullable=True, onupdate=datetime.datetime.now),
+                    )
 
-mapper(Cargo, cargo_table)
+mapper(Cargo, cargo_table,
+   properties={
+       "owner": relation(Fit)
+   }
+)

eos/db/saveddata/character.py

@@ -1,4 +1,4 @@
-#===============================================================================
+# ===============================================================================
 # Copyright (C) 2010 Diego Duclos
 #
 # This file is part of eos.
@@ -15,30 +15,80 @@
 #
 # 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 import Table, Column, Integer, ForeignKey, String, DateTime, Float, UniqueConstraint
 from sqlalchemy.orm import relation, mapper
+import datetime
 
 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, HandledSsoCharacterList
-from eos.effectHandlerHelpers import HandledImplantBoosterList
+from eos.saveddata.implant import Implant
+from eos.saveddata.user import User
+from eos.saveddata.character import Character, Skill
+from eos.saveddata.ssocharacter import SsoCharacter
+
+
+
 
 characters_table = Table("characters", saveddata_meta,
-                         Column("ID", Integer, primary_key = True),
+                         Column("ID", Integer, primary_key=True),
-                         Column("name", String, nullable = False),
+                         Column("name", String, nullable=False),
-                         Column("apiID", Integer),
-                         Column("apiKey", String),
-                         Column("defaultChar", Integer),
-                         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),
+                         Column("secStatus", Float, nullable=True, default=0.0),
+                         Column("created", DateTime, nullable=True, default=datetime.datetime.now),
+                         Column("modified", DateTime, nullable=True, onupdate=datetime.datetime.now))
+
+sso_table = Table("ssoCharacter", saveddata_meta,
+                    Column("ID", Integer, primary_key=True),
+                    Column("client", String, nullable=False),
+                    Column("characterID", Integer, nullable=False),
+                    Column("characterName", String, nullable=False),
+                    Column("refreshToken", String, nullable=False),
+                    Column("accessToken", String, nullable=False),
+                    Column("accessTokenExpires", DateTime, nullable=False),
+                    Column("created", DateTime, nullable=True, default=datetime.datetime.now),
+                    Column("modified", DateTime, nullable=True, onupdate=datetime.datetime.now),
+                    UniqueConstraint('client', 'characterID', name='uix_client_characterID'),
+                    UniqueConstraint('client', 'characterName', name='uix_client_characterName')
+                  )
+
+sso_character_map_table = Table("ssoCharacterMap", saveddata_meta,
+                    Column("characterID", ForeignKey("characters.ID"), primary_key=True),
+                    Column("ssoCharacterID", ForeignKey("ssoCharacter.ID"), primary_key=True),
+                  )
+
+
+mapper(SsoCharacter, sso_table)
 
 mapper(Character, characters_table,
-       properties = {"_Character__owner" : relation(User, backref = "characters"),
+       properties={
-                     "_Character__skills" : relation(Skill, backref="character", cascade = "all,delete-orphan"),
+           "_Character__alphaCloneID": characters_table.c.alphaCloneID,
-                     "_Character__implants" : relation(Implant, collection_class = HandledImplantBoosterList, cascade='all,delete-orphan', single_parent=True,
+           "savedName"               : characters_table.c.name,
-                                                       primaryjoin = charImplants_table.c.charID == characters_table.c.ID,
+           "_Character__secStatus": characters_table.c.secStatus,
-                                                       secondaryjoin = charImplants_table.c.implantID == Implant.ID,
+           "_Character__owner"       : relation(
-                                                       secondary = charImplants_table),})
+                   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),
+           "_Character__ssoCharacters"    : relation(
+                   SsoCharacter,
+                   collection_class=HandledSsoCharacterList,
+                   backref='characters',
+                   secondary=sso_character_map_table)
+       }
+       )

eos/db/saveddata/crest.py

@@ -1,31 +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, String, Boolean
-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))
-
-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,21 +15,25 @@
 #
 # 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 import Table, Column, Integer, ForeignKey, String, DateTime
 from sqlalchemy.orm import mapper
+import datetime
 
 from eos.db import saveddata_meta
-from eos.types import DamagePattern
+from eos.saveddata.damagePattern 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),
                              Column("kineticAmount", Integer),
                              Column("explosiveAmount", Integer),
-                             Column("ownerID", ForeignKey("users.ID"), nullable=True))
+                             Column("ownerID", ForeignKey("users.ID"), nullable=True),
+                             Column("created", DateTime, nullable=True, default=datetime.datetime.now),
+                             Column("modified", DateTime, nullable=True, onupdate=datetime.datetime.now)
+                             )
 
 mapper(DamagePattern, damagePatterns_table)

eos/db/saveddata/databaseRepair.py

@@ -0,0 +1,239 @@
+# ===============================================================================
+# 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/>.
+# ===============================================================================
+
+from sqlalchemy.exc import DatabaseError
+from logbook import Logger
+
+pyfalog = Logger(__name__)
+
+
+class DatabaseCleanup(object):
+    def __init__(self):
+        pass
+
+    @staticmethod
+    def ExecuteSQLQuery(saveddata_engine, query):
+        try:
+            results = saveddata_engine.execute(query)
+            return results
+        except DatabaseError:
+            pyfalog.error("Failed to connect to database or error executing query:\n{0}", 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
+        pyfalog.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)
+            pyfalog.error("Database corruption found. Cleaning up {0} 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
+        pyfalog.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:
+                pyfalog.error("Missing uniform damage pattern.")
+            elif len(rows) > 1:
+                pyfalog.error("More than one uniform damage pattern found.")
+            else:
+                uniform_damage_pattern_id = rows[0]['ID']
+                update_query = "UPDATE 'fits' SET 'damagePatternID' = {} " \
+                               "WHERE damagePatternID NOT IN (SELECT ID FROM damagePatterns) OR damagePatternID IS NULL".format(uniform_damage_pattern_id)
+                update_results = DatabaseCleanup.ExecuteSQLQuery(saveddata_engine, update_query)
+                pyfalog.error("Database corruption found. Cleaning up {0} 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.
+        pyfalog.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:
+                pyfalog.error("Missing 'All 5' character.")
+            elif len(rows) > 1:
+                pyfalog.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)
+                pyfalog.error("Database corruption found. Cleaning up {0} 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
+        pyfalog.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)
+            pyfalog.error("Database corruption found. Cleaning up {0} 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
+        pyfalog.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)
+            pyfalog.error("Database corruption found. Cleaning up {0} records.", delete.rowcount)
+
+    @staticmethod
+    def OrphanedFitIDItemID(saveddata_engine):
+        # Orphaned items that are missing the fit ID or item ID.
+        # See issue #954
+        for table in ['drones', 'cargo', 'fighters']:
+            pyfalog.debug("Running database cleanup for orphaned {0} items.", table)
+            query = "SELECT COUNT(*) AS num FROM {} WHERE itemID IS NULL OR itemID = '' or itemID = '0' or fitID IS NULL OR fitID = '' or fitID = '0'".format(
+                    table)
+            results = DatabaseCleanup.ExecuteSQLQuery(saveddata_engine, query)
+
+            if results is None:
+                return
+
+            row = results.first()
+
+            if row and row['num']:
+                query = "DELETE FROM {} WHERE itemID IS NULL OR itemID = '' or itemID = '0' or fitID IS NULL OR fitID = '' or fitID = '0'".format(
+                        table)
+                delete = DatabaseCleanup.ExecuteSQLQuery(saveddata_engine, query)
+                pyfalog.error("Database corruption found. Cleaning up {0} records.", delete.rowcount)
+
+        for table in ['modules']:
+            pyfalog.debug("Running database cleanup for orphaned {0} items.", table)
+            query = "SELECT COUNT(*) AS num FROM {} WHERE itemID = '0' or fitID IS NULL OR fitID = '' or fitID = '0'".format(
+                    table)
+            results = DatabaseCleanup.ExecuteSQLQuery(saveddata_engine, query)
+
+            if results is None:
+                return
+
+            row = results.first()
+
+            if row and row['num']:
+                query = "DELETE FROM {} WHERE itemID = '0' or fitID IS NULL OR fitID = '' or fitID = '0'".format(table)
+                delete = DatabaseCleanup.ExecuteSQLQuery(saveddata_engine, query)
+                pyfalog.error("Database corruption found. Cleaning up {0} records.", delete.rowcount)
+
+    @staticmethod
+    def NullDamageTargetPatternValues(saveddata_engine):
+        # Find patterns that have null values
+        # See issue #954
+        for profileType in ['damagePatterns', 'targetResists']:
+            for damageType in ['em', 'thermal', 'kinetic', 'explosive']:
+                pyfalog.debug("Running database cleanup for null {0} values. ({1})", profileType, damageType)
+                query = "SELECT COUNT(*) AS num FROM {0} WHERE {1}Amount IS NULL OR {1}Amount = ''".format(profileType,
+                                                                                                           damageType)
+                results = DatabaseCleanup.ExecuteSQLQuery(saveddata_engine, query)
+
+                if results is None:
+                    return
+
+                row = results.first()
+
+                if row and row['num']:
+                    query = "UPDATE '{0}' SET '{1}Amount' = '0' WHERE {1}Amount IS NULL OR {1}Amount = ''".format(profileType,
+                                                                                                                  damageType)
+                    delete = DatabaseCleanup.ExecuteSQLQuery(saveddata_engine, query)
+                    pyfalog.error("Database corruption found. Cleaning up {0} records.", delete.rowcount)
+
+    @staticmethod
+    def DuplicateSelectedAmmoName(saveddata_engine):
+        # Orphaned items that are missing the fit ID or item ID.
+        # See issue #954
+        pyfalog.debug("Running database cleanup for duplicated selected ammo profiles.")
+        query = "SELECT COUNT(*) AS num FROM damagePatterns WHERE name = 'Selected Ammo'"
+        results = DatabaseCleanup.ExecuteSQLQuery(saveddata_engine, query)
+
+        if results is None:
+            return
+
+        row = results.first()
+
+        if row and row['num'] > 1:
+            query = "DELETE FROM damagePatterns WHERE name = 'Selected Ammo'"
+            delete = DatabaseCleanup.ExecuteSQLQuery(saveddata_engine, query)
+            pyfalog.error("Database corruption found. Cleaning up {0} 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,29 @@
 #
 # 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, DateTime
+from sqlalchemy.orm import mapper, relation
+import datetime
 
-from sqlalchemy import Table, Column, Integer, ForeignKey, Boolean
-from sqlalchemy.orm import mapper
 from eos.db import saveddata_meta
-from eos.types import Drone
+from eos.saveddata.drone import Drone
+from eos.saveddata.fit import Fit
 
 drones_table = Table("drones", saveddata_meta,
                      Column("groupID", Integer, primary_key=True),
-                     Column("fitID", Integer, ForeignKey("fits.ID"), nullable = False, index = True),
+                     Column("fitID", Integer, ForeignKey("fits.ID"), nullable=False, index=True),
-                     Column("itemID", Integer, nullable = False),
+                     Column("itemID", Integer, nullable=False),
-                     Column("amount", Integer, nullable = False),
+                     Column("amount", Integer, nullable=False),
-                     Column("amountActive", Integer, nullable = False),
+                     Column("amountActive", Integer, nullable=False),
-                     Column("projected", Boolean, default = False))
+                     Column("projected", Boolean, default=False),
+                     Column("created", DateTime, nullable=True, default=datetime.datetime.now),
+                     Column("modified", DateTime, nullable=True, onupdate=datetime.datetime.now)
+                     )
 
-mapper(Drone, drones_table)
+mapper(Drone, drones_table,
+   properties={
+       "owner": relation(Fit)
+   }
+)

eos/db/saveddata/fighter.py

@@ -0,0 +1,55 @@
+# ===============================================================================
+# 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, DateTime
+from sqlalchemy.orm import mapper, relation
+import datetime
+
+from eos.db import saveddata_meta
+from eos.saveddata.fighterAbility import FighterAbility
+from eos.saveddata.fighter import Fighter
+from eos.saveddata.fit import Fit
+
+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),
+                       Column("created", DateTime, nullable=True, default=datetime.datetime.now),
+                       Column("modified", DateTime, nullable=True, onupdate=datetime.datetime.now)
+                       )
+
+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,41 +15,71 @@
 #
 # 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, DateTime
+import datetime
 
 from eos.db import saveddata_meta
-from eos.db.saveddata.module import modules_table
+from eos.db import saveddata_session
-from eos.db.saveddata.drone import drones_table
 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
+from eos.db.saveddata.module import modules_table
-from eos.effectHandlerHelpers import *
+from eos.effectHandlerHelpers import HandledModuleList, HandledImplantBoosterList, HandledProjectedModList, \
+    HandledDroneCargoList, HandledProjectedDroneList
+from eos.saveddata.implant import Implant
+from eos.saveddata.character import Character
+from eos.saveddata.user import User
+from eos.saveddata.fighter import Fighter
+from eos.saveddata.fit import Fit as es_Fit, ImplantLocation
+from eos.saveddata.drone import Drone
+from eos.saveddata.booster import Booster
+from eos.saveddata.module import Module
+from eos.saveddata.cargo import Cargo
+from eos.saveddata.damagePattern import DamagePattern
+from eos.saveddata.targetResists import TargetResists
 
 fits_table = Table("fits", saveddata_meta,
-                         Column("ID", Integer, primary_key = True),
+                   Column("ID", Integer, primary_key=True),
-                         Column("ownerID", ForeignKey("users.ID"), nullable = True, index = True),
+                   Column("ownerID", ForeignKey("users.ID"), nullable=True, index=True),
-                         Column("shipID", Integer, nullable = False, index = True),
+                   Column("shipID", Integer, nullable=False, index=True),
-                         Column("name", String, nullable = False),
+                   Column("name", String, nullable=False),
-                         Column("timestamp", Integer, nullable = False),
+                   Column("timestamp", Integer, nullable=False),
-                         Column("characterID", ForeignKey("characters.ID"), nullable = True),
+                   Column("characterID", ForeignKey("characters.ID"), nullable=True),
-                         Column("damagePatternID", ForeignKey("damagePatterns.ID"), nullable=True),
+                   Column("damagePatternID", ForeignKey("damagePatterns.ID"), nullable=True),
-                         Column("booster", Boolean, nullable = False, index = True, default = 0),
+                   Column("booster", Boolean, nullable=False, index=True, default=0),
-                         Column("targetResistsID", ForeignKey("targetResists.ID"), nullable=True),
+                   Column("targetResistsID", ForeignKey("targetResists.ID"), nullable=True),
-                         Column("modeID", Integer, nullable=True),
+                   Column("modeID", Integer, nullable=True),
-)
+                   Column("implantLocation", Integer, nullable=False, default=ImplantLocation.FIT),
+                   Column("notes", String, nullable=True),
+                   Column("ignoreRestrictions", Boolean, default=0),
+                   Column("created", DateTime, nullable=True, default=datetime.datetime.now),
+                   Column("modified", DateTime, nullable=True, default=datetime.datetime.now, onupdate=datetime.datetime.now)
+                   )
 
 projectedFits_table = Table("projectedFits", saveddata_meta,
-                            Column("sourceID", ForeignKey("fits.ID"), primary_key = True),
+                            Column("sourceID", ForeignKey("fits.ID"), primary_key=True),
-                            Column("victimID", ForeignKey("fits.ID"), primary_key = True),
+                            Column("victimID", ForeignKey("fits.ID"), primary_key=True),
-                            Column("amount", Integer, nullable = False, default = 1),
+                            Column("amount", Integer, nullable=False, default=1),
-                            Column("active", Boolean, nullable = False, default = 1),
+                            Column("active", Boolean, nullable=False, default=1),
-)
+                            Column("created", DateTime, nullable=True, default=datetime.datetime.now),
+                            Column("modified", DateTime, nullable=True, onupdate=datetime.datetime.now)
+                            )
+
+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),
+                          Column("created", DateTime, nullable=True, default=datetime.datetime.now),
+                          Column("modified", DateTime, nullable=True, onupdate=datetime.datetime.now)
+                          )
+
 
 class ProjectedFit(object):
     def __init__(self, sourceID, source_fit, amount=1, active=True):
@@ -62,9 +92,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)
+            saveddata_session.delete(self.source_fit)
-            eos.db.saveddata_session.flush()
+            saveddata_session.flush()
-            eos.db.saveddata_session.refresh(self.victim_fit)
+            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
@@ -78,88 +108,151 @@ class ProjectedFit(object):
 
     def __repr__(self):
         return "ProjectedFit(sourceID={}, victimID={}, amount={}, active={}) at {}".format(
-            self.sourceID, self.victimID, self.amount, self.active, hex(id(self))
+                self.sourceID, self.victimID, self.amount, self.active, hex(id(self))
         )
 
-Fit._Fit__projectedFits = association_proxy(
+
-    "victimOf",  # look at the victimOf association...
+class CommandFit(object):
-    "source_fit",  # .. and return the source fits
+    def __init__(self, boosterID, booster_fit, active=True):
-    creator=lambda sourceID, source_fit: ProjectedFit(sourceID, source_fit)
+        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,
+es_Fit._Fit__commandFits = association_proxy(
-        properties = {
+        "boostedOf",  # look at the boostedOf association...
-            "_Fit__modules": relation(
+        "booster_fit",  # .. and return the booster fit
-                Module,
+        creator=lambda boosterID, booster_fit: CommandFit(boosterID, booster_fit)
-                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'),
+# These relationships are broken out so that we can easily access it in the events stuff
-            "_Fit__projectedModules": relation(
+# We sometimes don't want particular relationships to cause a fit modified update (eg: projecting
-                Module,
+# a fit onto another would 'modify' both fits unless the following relationship is ignored)
-                collection_class=HandledProjectedModList,
+projectedFitSourceRel = relationship(
-                cascade='all, delete, delete-orphan',
+   ProjectedFit,
-                single_parent=True,
+   primaryjoin=projectedFits_table.c.sourceID == fits_table.c.ID,
-                primaryjoin=and_(modules_table.c.fitID == fits_table.c.ID, modules_table.c.projected == True)),
+   backref='source_fit',
-            "owner": relation(
+   collection_class=attribute_mapped_collection('victimID'),
-                User,
+   cascade='all, delete, delete-orphan')
-                backref="fits"),
+
-            "itemID": fits_table.c.shipID,
+
-            "shipID": fits_table.c.shipID,
+boostedOntoRel = relationship(
-            "_Fit__boosters": relation(
+   CommandFit,
-                Booster,
+   primaryjoin=commandFits_table.c.boosterID == fits_table.c.ID,
-                collection_class=HandledImplantBoosterList,
+   backref='booster_fit',
-                cascade='all, delete, delete-orphan',
+   collection_class=attribute_mapped_collection('boostedID'),
-                single_parent=True),
+   cascade='all, delete, delete-orphan')
-            "_Fit__drones": relation(
+
-                Drone,
+mapper(es_Fit, fits_table,
-                collection_class=HandledDroneCargoList,
+       properties={
-                cascade='all, delete, delete-orphan',
+           "_Fit__modules": relation(
-                single_parent=True,
+                   Module,
-                primaryjoin=and_(drones_table.c.fitID == fits_table.c.ID, drones_table.c.projected == False)),
+                   collection_class=HandledModuleList,
-            "_Fit__cargo": relation(
+                   primaryjoin=and_(modules_table.c.fitID == fits_table.c.ID, modules_table.c.projected == False),  # noqa
-                Cargo,
+                   order_by=modules_table.c.position,
-                collection_class=HandledDroneCargoList,
+                   cascade='all, delete, delete-orphan'),
-                cascade='all, delete, delete-orphan',
+           "_Fit__projectedModules": relation(
-                single_parent=True,
+                   Module,
-                primaryjoin=and_(cargo_table.c.fitID == fits_table.c.ID)),
+                   collection_class=HandledProjectedModList,
-            "_Fit__projectedDrones": relation(
+                   cascade='all, delete, delete-orphan',
-                Drone,
+                   single_parent=True,
-                collection_class=HandledProjectedDroneList,
+                   primaryjoin=and_(modules_table.c.fitID == fits_table.c.ID, modules_table.c.projected == True)),  # noqa
-                cascade='all, delete, delete-orphan',
+           "owner": relation(
-                single_parent=True,
+                   User,
-                primaryjoin=and_(drones_table.c.fitID == fits_table.c.ID, drones_table.c.projected == True)),
+                   backref="fits"),
-            "_Fit__implants": relation(
+           "itemID": fits_table.c.shipID,
-                Implant,
+           "shipID": fits_table.c.shipID,
-                collection_class=HandledImplantBoosterList,
+           "_Fit__boosters": relation(
-                cascade='all, delete, delete-orphan',
+                   Booster,
-                backref='fit',
+                   collection_class=HandledImplantBoosterList,
-                single_parent=True,
+                   cascade='all, delete, delete-orphan',
-                primaryjoin=fitImplants_table.c.fitID == fits_table.c.ID,
+                   backref='owner',
-                secondaryjoin=fitImplants_table.c.implantID == Implant.ID,
+                   single_parent=True),
-                secondary=fitImplants_table),
+           "_Fit__drones": relation(
-            "_Fit__character": relation(
+                   Drone,
-                Character,
+                   collection_class=HandledDroneCargoList,
-                backref="fits"),
+                   cascade='all, delete, delete-orphan',
-            "_Fit__damagePattern": relation(DamagePattern),
+                   single_parent=True,
-            "_Fit__targetResists": relation(TargetResists),
+                   primaryjoin=and_(drones_table.c.fitID == fits_table.c.ID, drones_table.c.projected == False)),  # noqa
-            "projectedOnto": relationship(
+           "_Fit__fighters": relation(
-                ProjectedFit,
+                   Fighter,
-                primaryjoin=projectedFits_table.c.sourceID == fits_table.c.ID,
+                   collection_class=HandledDroneCargoList,
-                backref='source_fit',
+                   cascade='all, delete, delete-orphan',
-                collection_class=attribute_mapped_collection('victimID'),
+                   single_parent=True,
-                cascade='all, delete, delete-orphan'),
+                   primaryjoin=and_(fighters_table.c.fitID == fits_table.c.ID, fighters_table.c.projected == False)),  # noqa
-            "victimOf": relationship(
+           "_Fit__cargo": relation(
-                ProjectedFit,
+                   Cargo,
-                primaryjoin=fits_table.c.ID == projectedFits_table.c.victimID,
+                   collection_class=HandledDroneCargoList,
-                backref='victim_fit',
+                   cascade='all, delete, delete-orphan',
-                collection_class=attribute_mapped_collection('sourceID'),
+                   single_parent=True,
-                cascade='all, delete, delete-orphan'),
+                   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='owner',
+                   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": projectedFitSourceRel,
+           "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": boostedOntoRel,
+           "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 = {
+   properties={
-            "_ProjectedFit__amount": projectedFits_table.c.amount,
+       "_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,25 +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, Boolean
+from sqlalchemy import Table, Column, Integer, ForeignKey, Boolean, DateTime
 from sqlalchemy.orm import mapper
+import datetime
 
 from eos.db import saveddata_meta
-from eos.types import Implant
+from eos.saveddata.implant import Implant
 
 implants_table = Table("implants", saveddata_meta,
-                     Column("ID", Integer, primary_key = True),
+                       Column("ID", Integer, primary_key=True),
-                     Column("itemID", Integer),
+                       Column("itemID", Integer),
-                     Column("active", Boolean))
+                       Column("active", Boolean),
+                       Column("created", DateTime, nullable=True, default=datetime.datetime.now),
+                       Column("modified", DateTime, nullable=True, onupdate=datetime.datetime.now)
+                       )
 
 fitImplants_table = Table("fitImplants", saveddata_meta,
-                          Column("fitID", ForeignKey("fits.ID"), index = True),
+                          Column("fitID", ForeignKey("fits.ID"), index=True),
-                          Column("implantID", ForeignKey("implants.ID"), primary_key = True))
+                          Column("implantID", ForeignKey("implants.ID"), primary_key=True))
 
 charImplants_table = Table("charImplants", saveddata_meta,
-                           Column("charID", ForeignKey("characters.ID"), index = True),
+                           Column("charID", ForeignKey("characters.ID"), index=True),
-                           Column("implantID", ForeignKey("implants.ID"), primary_key = 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,49 @@
+# ===============================================================================
+# 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, DateTime
+from sqlalchemy.orm import relation, mapper
+import datetime
+
+from eos.db import saveddata_meta
+from eos.db.saveddata.implant import implantsSetMap_table
+from eos.effectHandlerHelpers import HandledImplantBoosterList
+from eos.saveddata.implant import Implant
+from eos.saveddata.implantSet import ImplantSet
+
+implant_set_table = Table("implantSets", saveddata_meta,
+                          Column("ID", Integer, primary_key=True),
+                          Column("name", String, nullable=False),
+                          Column("created", DateTime, nullable=True, default=datetime.datetime.now),
+                          Column("modified", DateTime, nullable=True, onupdate=datetime.datetime.now)
+                          )
+
+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(object):
+    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.saveddata.miscData import MiscData
 
 miscdata_table = Table("miscdata", saveddata_meta,
-                           Column("fieldName", String, primary_key=True),
+                       Column("fieldName", String, primary_key=True),
-                           Column("fieldValue", String))
+                       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,25 +15,28 @@
 #
 # 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 import Table, Column, Integer, ForeignKey, CheckConstraint, Boolean, DateTime
 from sqlalchemy.orm import relation, mapper
+import datetime
 
 from eos.db import saveddata_meta
-from eos.types import Module, Fit
+from eos.saveddata.module import Module
+from eos.saveddata.fit import Fit
 
 modules_table = Table("modules", saveddata_meta,
-                      Column("ID", Integer, primary_key = True),
+                      Column("ID", Integer, primary_key=True),
-                      Column("fitID", Integer, ForeignKey("fits.ID"), nullable = False, index = True),
+                      Column("fitID", Integer, ForeignKey("fits.ID"), nullable=False, index=True),
-                      Column("itemID", Integer, nullable = True),
+                      Column("itemID", Integer, nullable=True),
-                      Column("dummySlot", Integer, nullable = True, default = None),
+                      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),
+                      Column("created", DateTime, nullable=True, default=datetime.datetime.now),
+                      Column("modified", DateTime, nullable=True, onupdate=datetime.datetime.now),
                       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,17 +15,21 @@
 #
 # 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 import Table, Column, Integer, Float, DateTime
 from sqlalchemy.orm import mapper
+import datetime
 
 from eos.db import saveddata_meta
-from eos.types import Override
+from eos.saveddata.override import Override
 
 overrides_table = Table("overrides", saveddata_meta,
-                     Column("itemID", Integer, primary_key=True,  index = True),
+                        Column("itemID", Integer, primary_key=True, index=True),
-                     Column("attrID", Integer, primary_key=True, index = True),
+                        Column("attrID", Integer, primary_key=True, index=True),
-                     Column("value", Float, nullable = False))
+                        Column("value", Float, nullable=False),
+                        Column("created", DateTime, nullable=True, default=datetime.datetime.now),
+                        Column("modified", DateTime, nullable=True, onupdate=datetime.datetime.now)
+                        )
 
 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,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, Float, Integer
 from sqlalchemy.orm import mapper
+
 from eos.db import saveddata_meta
-from eos.types import Price
+from eos.saveddata.price import Price
 
 prices_table = Table("prices", saveddata_meta,
                      Column("typeID", Integer, primary_key=True),
-                     Column("price", Float),
+                     Column("price", Float, default=0.0),
-                     Column("time", Integer, nullable = False),
+                     Column("time", Integer, nullable=False),
                      Column("failed", Integer))
 
-mapper(Price, prices_table)
+mapper(Price, prices_table, properties={
+    "_Price__price": prices_table.c.price,
+})

eos/db/saveddata/queries.py

@@ -1,4 +1,4 @@
-#===============================================================================
+# ===============================================================================
 # Copyright (C) 2010 Diego Duclos
 #
 # This file is part of eos.
@@ -15,27 +15,44 @@
 #
 # 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 eos.db.util import processEager, processWhere
+import sys
-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.db.saveddata.fit import projectedFits_table
 from sqlalchemy.sql import and_
+from sqlalchemy import desc, select
+
+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.saveddata.price import Price
+from eos.saveddata.user import User
+from eos.saveddata.ssocharacter import SsoCharacter
+from eos.saveddata.damagePattern import DamagePattern
+from eos.saveddata.targetResists import TargetResists
+from eos.saveddata.character import Character
+from eos.saveddata.implantSet import ImplantSet
+from eos.saveddata.fit import Fit
+from eos.saveddata.module import Module
+from eos.saveddata.miscData import MiscData
+from eos.saveddata.override import Override
+
 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 +61,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
@@ -55,6 +72,7 @@ if configVal is True:
             def checkAndReturn(*args, **kwargs):
                 useCache = kwargs.pop("useCache", True)
                 cacheKey = []
+                items = None
                 cacheKey.extend(args)
                 for keyword in keywords:
                     cacheKey.append(kwargs.get(keyword))
@@ -70,7 +88,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,16 +100,18 @@ 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():
+        for _, localCache in functionCache.items():
             toDelete = set()
-            for cacheKey, info in localCache.iteritems():
+            for cacheKey, info in localCache.items():
                 IDs = info[1]
                 if ID in IDs:
                     toDelete.add(cacheKey)
@@ -111,11 +131,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 +145,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):
@@ -133,7 +156,7 @@ def getUser(lookfor, eager=None):
             eager = processEager(eager)
             with sd_lock:
                 user = saveddata_session.query(User).options(*eager).filter(User.ID == lookfor).first()
-    elif isinstance(lookfor, basestring):
+    elif isinstance(lookfor, str):
         eager = processEager(eager)
         with sd_lock:
             user = saveddata_session.query(User).options(*eager).filter(User.username == lookfor).first()
@@ -141,6 +164,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):
@@ -151,20 +175,23 @@ def getCharacter(lookfor, eager=None):
             eager = processEager(eager)
             with sd_lock:
                 character = saveddata_session.query(Character).options(*eager).filter(Character.ID == lookfor).first()
-    elif isinstance(lookfor, basestring):
+    elif isinstance(lookfor, str):
         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 +201,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 +222,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,50 +244,73 @@ 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
-    If no user is passed, do this for all users.
-    """
 
-    if ownerID is not None and not isinstance(ownerID, int):
+def getRecentFits(ownerID=None, where=None, eager=None):
-        raise TypeError("OwnerID must be integer")
-    filter = Fit.booster == 1
-    if ownerID is not None:
-        filter = and_(filter, Fit.ownerID == ownerID)
-
-    filter = processWhere(filter, where)
     eager = processEager(eager)
     with sd_lock:
-        fits = removeInvalid(saveddata_session.query(Fit).options(*eager).filter(filter).all())
+        q = select((
+            Fit.ID,
+            Fit.shipID,
+            Fit.name,
+            Fit.modified,
+            Fit.created,
+            Fit.timestamp,
+            Fit.notes
+        )).order_by(desc(Fit.modified), desc(Fit.timestamp)).limit(50)
+        fits = eos.db.saveddata_session.execute(q).fetchall()
 
     return fits
 
+
+def getFitsWithModules(typeIDs, eager=None):
+    """
+    Get all the fits that have typeIDs fitted to them
+    """
+
+    if not hasattr(typeIDs, "__iter__"):
+        typeIDs = (typeIDs,)
+
+    eager = processEager(eager)
+    with sd_lock:
+        fits = removeInvalid(saveddata_session.query(Fit).join(Module).options(*eager).filter(Module.itemID.in_(typeIDs)).all())
+
+    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):
-        if ownerID is not None and not isinstance(ownerID, int):
+        raise TypeError("OwnerID must be integer")
-            raise TypeError("OwnerID must be integer")
-        filter = Fit.shipID == shipID
-        if ownerID is not None:
-            filter = and_(filter, Fit.ownerID == ownerID)
 
-        filter = processWhere(filter, where)
+    if isinstance(lookfor, int):
-        eager = processEager(eager)
+        filter = Fit.shipID == lookfor
-        with sd_lock:
+    elif isinstance(lookfor, list):
-            count = saveddata_session.query(Fit).options(*eager).filter(filter).count()
+        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 +318,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,32 +328,58 @@ 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):
+    if isinstance(field, str):
         with sd_lock:
             data = saveddata_session.query(MiscData).get(field)
     else:
         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 clearDamagePatterns():
+    with sd_lock:
+        deleted_rows = saveddata_session.query(DamagePattern).filter(DamagePattern.name != 'Uniform').delete()
+    commit()
+    return deleted_rows
+
+
 def getTargetResistsList(eager=None):
     eager = processEager(eager)
     with sd_lock:
         patterns = saveddata_session.query(TargetResists).options(*eager).all()
     return patterns
 
+
+def clearTargetResists():
+    with sd_lock:
+        deleted_rows = saveddata_session.query(TargetResists).delete()
+    commit()
+    return deleted_rows
+
+
+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 +389,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(
-    elif isinstance(lookfor, basestring):
+                        DamagePattern.ID == lookfor).first()
+    elif isinstance(lookfor, str):
         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 +410,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(
-    elif isinstance(lookfor, basestring):
+                        TargetResists.ID == lookfor).first()
+    elif isinstance(lookfor, str):
         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, str):
+        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):
+    if not isinstance(nameLike, str):
         raise TypeError("Need string as argument")
     # Prepare our string for request
-    nameLike = u"%{0}%".format(sqlizeString(nameLike))
+    nameLike = "%{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 +456,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,63 +466,71 @@ def getProjectedFits(fitID):
     else:
         raise TypeError("Need integer as argument")
 
-def getCrestCharacters(eager=None):
+
+def getSsoCharacters(clientHash, eager=None):
     eager = processEager(eager)
     with sd_lock:
-        characters = saveddata_session.query(CrestChar).options(*eager).all()
+        characters = saveddata_session.query(SsoCharacter).filter(SsoCharacter.client == clientHash).options(*eager).all()
     return characters
 
-@cachedQuery(CrestChar, 1, "lookfor")
+
-def getCrestCharacter(lookfor, eager=None):
+@cachedQuery(SsoCharacter, 1, "lookfor", "clientHash")
+def getSsoCharacter(lookfor, clientHash, eager=None):
+    filter = SsoCharacter.client == clientHash
+
     if isinstance(lookfor, int):
-        if eager is None:
+        filter = and_(filter, SsoCharacter.ID == lookfor)
-            with sd_lock:
+    elif isinstance(lookfor, str):
-                character = saveddata_session.query(CrestChar).get(lookfor)
+        filter = and_(filter, SsoCharacter.characterName == lookfor)
-        else:
-            eager = processEager(eager)
-            with sd_lock:
-                character = saveddata_session.query(CrestChar).options(*eager).filter(CrestChar.ID == lookfor).first()
-    elif isinstance(lookfor, basestring):
-        eager = processEager(eager)
-        with sd_lock:
-            character = saveddata_session.query(CrestChar).options(*eager).filter(CrestChar.name == lookfor).first()
     else:
         raise TypeError("Need integer or string as argument")
+
+    eager = processEager(eager)
+    with sd_lock:
+        character = saveddata_session.query(SsoCharacter).options(*eager).filter(filter).first()
+
     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]
 
     if invalids:
-        map(fits.remove, invalids)
+        list(map(fits.remove, invalids))
-        map(saveddata_session.delete, invalids)
+        list(map(saveddata_session.delete, invalids))
         saveddata_session.commit()
 
     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:
@@ -483,5 +540,10 @@ def remove(stuff):
 
 def commit():
     with sd_lock:
-        saveddata_session.commit()
+        try:
-        saveddata_session.flush()
+            saveddata_session.commit()
+            saveddata_session.flush()
+        except Exception as ex:
+            saveddata_session.rollback()
+            exc_info = sys.exc_info()
+            raise exc_info[0](exc_info[1]).with_traceback(exc_info[2])

eos/db/saveddata/skill.py

@@ -1,4 +1,4 @@
-#===============================================================================
+# ===============================================================================
 # Copyright (C) 2010 Diego Duclos
 #
 # This file is part of eos.
@@ -15,17 +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, ForeignKey
+from sqlalchemy import Table, Column, Integer, ForeignKey, DateTime
 from sqlalchemy.orm import mapper
+import datetime
 
 from eos.db import saveddata_meta
-from eos.types import Skill
+from eos.saveddata.character import Skill
+
 
 skills_table = Table("characterSkills", saveddata_meta,
-                     Column("characterID", ForeignKey("characters.ID"), primary_key = True, index = True),
+                     Column("characterID", ForeignKey("characters.ID"), primary_key=True, index=True),
-                     Column("itemID", Integer, primary_key = True),
+                     Column("itemID", Integer, primary_key=True),
-                     Column("_Skill__level", Integer, nullable = True))
+                     Column("_Skill__level", Integer, nullable=True),
+                     Column("created", DateTime, nullable=True, default=datetime.datetime.now),
+                     Column("modified", DateTime, nullable=True, onupdate=datetime.datetime.now)
+                     )
 
 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,21 +15,25 @@
 #
 # 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 import Table, Column, Integer, Float, ForeignKey, String, DateTime
 from sqlalchemy.orm import mapper
+import datetime
 
 from eos.db import saveddata_meta
-from eos.types import TargetResists
+from eos.saveddata.targetResists import TargetResists
 
 targetResists_table = Table("targetResists", saveddata_meta,
-                             Column("ID", Integer, primary_key = True),
+                            Column("ID", Integer, primary_key=True),
-                             Column("name", String),
+                            Column("name", String),
-                             Column("emAmount", Float),
+                            Column("emAmount", Float),
-                             Column("thermalAmount", Float),
+                            Column("thermalAmount", Float),
-                             Column("kineticAmount", Float),
+                            Column("kineticAmount", Float),
-                             Column("explosiveAmount", Float),
+                            Column("explosiveAmount", Float),
-                             Column("ownerID", ForeignKey("users.ID"), nullable=True))
+                            Column("ownerID", ForeignKey("users.ID"), nullable=True),
+                            Column("created", DateTime, nullable=True, default=datetime.datetime.now),
+                            Column("modified", DateTime, nullable=True, onupdate=datetime.datetime.now)
+                            )
 
 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,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, String, Boolean
 from sqlalchemy.orm import mapper
 
 from eos.db import saveddata_meta
-from eos.types import User
+from eos.saveddata.user import User
 
 users_table = Table("users", saveddata_meta,
-                         Column("ID", Integer, primary_key = True),
+                    Column("ID", Integer, primary_key=True),
-                         Column("username", String, nullable = False, unique = True),
+                    Column("username", String, nullable=False, unique=True),
-                         Column("password", String, nullable = False),
+                    Column("password", String, nullable=False),
-                         Column("admin", Boolean, 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,28 +15,31 @@
 #
 # 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_
 
-replace = {"attributes": "_Item__attributes",
+replace = {
-           "modules": "_Fit__modules",
+    "attributes"      : "_Item__attributes",
-           "projectedModules": "_Fit__projectedModules",
+    "modules"         : "_Fit__modules",
-           "boosters": "_Fit__boosters",
+    "projectedModules": "_Fit__projectedModules",
-           "drones": "_Fit__drones",
+    "boosters"        : "_Fit__boosters",
-           "projectedDrones": "_Fit__projectedDrones",
+    "drones"          : "_Fit__drones",
-           "implants": "_Fit__implants",
+    "projectedDrones" : "_Fit__projectedDrones",
-           "character": "_Fit__character",
+    "implants"        : "_Fit__implants",
-           "damagePattern": "_Fit__damagePattern",
+    "character"       : "_Fit__character",
-           "projectedFits": "_Fit__projectedFits"}
+    "damagePattern"   : "_Fit__damagePattern",
+    "projectedFits"   : "_Fit__projectedFits"
+}
+
 
 def processEager(eager):
-    if eager == None:
+    if eager is None:
         return tuple()
     else:
         l = []
-        if isinstance(eager, basestring):
+        if isinstance(eager, str):
             eager = (eager,)
 
         for e in eager:
@@ -44,9 +47,10 @@ def processEager(eager):
 
         return l
 
+
 def _replacements(eagerString):
     splitEager = eagerString.split(".")
-    for i in xrange(len(splitEager)):
+    for i in range(len(splitEager)):
         part = splitEager[i]
         replacement = replace.get(part)
         if replacement:
@@ -54,6 +58,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,14 +15,12 @@
 #
 # 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
+from logbook import Logger
-import eos.db
+
-import eos.types
+pyfalog = Logger(__name__)
-import logging
 
-logger = logging.getLogger(__name__)
 
 class HandledList(list):
     def filteredItemPreAssign(self, filter, *args, **kwargs):
@@ -108,15 +106,16 @@ 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")
-        for i in xrange(len(self)):
+        for i in range(len(self)):
             currMod = self[i]
             if currMod.isEmpty and not mod.isEmpty and currMod.slot == mod.slot:
                 currPos = mod.position or i
@@ -135,6 +134,7 @@ class HandledModuleList(HandledList):
         HandledList.append(self, mod)
         if mod.isInvalid:
             self.remove(mod)
+            return
 
     def insert(self, index, mod):
         mod.position = index
@@ -149,13 +149,13 @@ class HandledModuleList(HandledList):
         oldPos = mod.position
 
         mod.position = None
-        for i in xrange(oldPos, len(self)):
+        for i in range(oldPos, len(self)):
             self[i].position -= 1
 
     def toDummy(self, index):
         mod = self[index]
         if not mod.isEmpty:
-            dummy = eos.types.Module.buildEmpty(mod.slot)
+            dummy = mod.buildEmpty(mod.slot)
             dummy.position = index
             self[index] = dummy
 
@@ -164,10 +164,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):
@@ -185,6 +187,7 @@ class HandledDroneCargoList(HandledList):
         if thing.isInvalid:
             self.remove(thing)
 
+
 class HandledImplantBoosterList(HandledList):
     def append(self, thing):
         if thing.isInvalid:
@@ -195,12 +198,23 @@ class HandledImplantBoosterList(HandledList):
         # if needed, remove booster that was occupying slot
         oldObj = next((m for m in self if m.slot == thing.slot), None)
         if oldObj:
-            logging.info("Slot %d occupied with %s, replacing with %s", thing.slot, oldObj.item.name, thing.item.name)
+            pyfalog.info("Slot {0} occupied with {1}, replacing with {2}", thing.slot, oldObj.item.name, thing.item.name)
             oldObj.itemID = 0  # hack to remove from DB. See GH issue #324
             self.remove(oldObj)
 
         HandledList.append(self, thing)
 
+
+class HandledSsoCharacterList(list):
+    def append(self, character):
+        old = next((x for x in self if x.client == character.client), None)
+        if old is not None:
+            pyfalog.warning("Removing SSO Character with same hash: {}".format(repr(old)))
+            list.remove(self, old)
+
+        list.append(self, character)
+
+
 class HandledProjectedModList(HandledList):
     def append(self, proj):
         if proj.isInvalid:
@@ -218,7 +232,7 @@ class HandledProjectedModList(HandledList):
             oldEffect = next((m for m in self if m.item.group.name == "Effect Beacon"), None)
 
             if oldEffect:
-                logging.info("System effect occupied with %s, replacing with %s", oldEffect.item.name, proj.item.name)
+                pyfalog.info("System effect occupied with {0}, replacing with {1}", oldEffect.item.name, proj.item.name)
                 self.remove(oldEffect)
 
         HandledList.append(self, proj)
@@ -227,6 +241,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
@@ -236,6 +251,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)
@@ -252,6 +268,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

@@ -2,10 +2,13 @@
 #
 # Used by:
 # Modules named like: Memetic Algorithm Bank (8 of 8)
+# Implant: Neural Lace 'Blackglass' Net Intrusion 920-40
 # 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",
+                                     "accessDifficultyBonus",
-                                  container.getModifiedItemAttr("accessDifficultyBonusModifier"), position="post")
+                                     container.getModifiedItemAttr("accessDifficultyBonusModifier"), position="post")