Bump version

I18n

.appveyor.yml

@@ -0,0 +1,96 @@
+image: Visual Studio 2019
+clone_depth: 400
+
+environment:
+  matrix:
+    - PYTHON: "C:\\Python37-x64"
+# Should be enabled only for build process debugging
+# init:
+#   - ps: iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
+install:
+  - ps: echo("OS version:")
+  - ps: "[System.Environment]::OSVersion.Version"
+
+  - ps: echo("Filesystem - root:")
+  - ps: "ls \"C:\\\""
+
+  - ps: echo("Filesystem - projects root:")
+  - ps: "ls \"C:\\projects\\\""
+
+  - ps: echo("Filesystem - pyfa root:")
+  - ps: "ls \"C:\\projects\\$env:APPVEYOR_PROJECT_SLUG\\\""
+
+  - ps: echo("Filesystem - installed SDKs:")
+  - ps: "ls \"C:\\Program Files (x86)\\Windows Kits\\\""
+
+  # 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).
+  - cmd: "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%"
+  - cmd: "appveyor DownloadFile https://github.com/mlocati/gettext-iconv-windows/releases/download/v0.20.2-v1.16/gettext0.20.2-iconv1.16-shared-64.zip"
+  - cmd: "7z x gettext0.20.2-iconv1.16-shared-64.zip -ogettext"
+  - cmd: "SET PATH=gettext;%PATH%"
+
+  - cmd: "python --version"
+  - cmd: "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.
+  - cmd: "python -m pip install --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
+  - ps: echo("Install pip requirements:")
+  # This one is needed to build wxpython 4.0.6 on windows
+  - cmd: "python -m pip install pathlib2"
+  - cmd: "python -m pip install -r requirements.txt"
+  - cmd: "python -m pip install PyInstaller==3.6"
+
+before_build:
+    # directory that will contain the built files
+  - ps: $env:PYFA_DIST_DIR = "c:\projects\$env:APPVEYOR_PROJECT_SLUG\dist"
+  - ps: $env:PYFA_VERSION = (python ./scripts/dump_version.py)
+  - ps: echo("pyfa version $env:PYFA_VERSION")
+
+build_script:
+  - ps: echo("Build pyfa:")
+  - ps: Get-ChildItem locale/*.po -Recurse -File| Foreach {msgen $_.fullname -o $_.fullname}
+    # Build language files
+  - cmd: "python scripts/compile_lang.py"
+    # Dump language progress
+  - cmd: "python scripts/dump_crowdin_progress.py"
+    # Build gamedata DB
+  - cmd: "python db_update.py"
+  # Build command for PyInstaller
+  - cmd: "python -m PyInstaller --noupx --clean --windowed --noconsole -y pyfa.spec"
+  # Copy over manifest (See pyfa-org/pyfa#1622)
+  - ps: xcopy /y dist_assets\win\pyfa.exe.manifest $env:PYFA_DIST_DIR\pyfa\
+  # InnoScript EXE building. This is in a separate script because I don't feel like copying over the logic to AppVeyor script right now...
+  - cmd: "python dist_assets/win/dist.py"
+  - ps: dir $env:PYFA_DIST_DIR/
+
+after_build:
+  - ps: "ls \"./\""
+  - ps: 7z a "pyfa-$env:PYFA_VERSION-win.zip" -r "$env:PYFA_DIST_DIR\pyfa\*"
+
+test_script:
+  # Ha... we're just building
+
+artifacts:
+  - path: pyfa*-win.zip
+  - path: pyfa*-win.exe
+
+deploy:
+  tag: $(pyfa_version)
+  release: pyfa $(pyfa_version)
+  description: 'Release description'
+  provider: GitHub
+  auth_token:
+    secure: X+U3hOAMTt7HGXCR/LXaGNF6qyhUXetrjz5+xlWiNJQ3XEdzhZZmHK75m0Hm6qre
+  draft: true
+  force_update: false
+  # deploy on tag push only
+  on:
+    APPVEYOR_REPO_TAG: true

.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,36 @@
+# 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,15 +4,122 @@
 #Kwrite/Gedit/Other crapapps making backups
 *~
 
-#Eclipse
+#Patch files
+*.patch
+
+#Personal
+/saveddata/
+
+#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
+
+# 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
 
-#Patch files
-*.patch
-#Personal
-/saveddata
+# Pycharm project settings
+.idea
+eos.iml
+gitversion
+.version
+/.version
+*.swp
 
-#Pyfa file
-pyfaFits.html
+*.fsdbinary
+/locale/progress.json

.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,36 @@
+if:
+  tags: true
+os: linux
+language: python
+git:
+  depth: 400
+python:
+  - 3.8
+matrix:
+  include:
+  - os: osx
+    osx_image: xcode11.3
+    language: generic
+before_install:
+  - bash scripts/osx-translations.sh
+  - bash scripts/osx-setup.sh
+install:
+  - python3 scripts/compile_lang.py
+  - python3 scripts/dump_crowdin_progress.py
+  - python3 db_update.py
+  - export PYFA_VERSION="$(python3 scripts/dump_version.py)"
+  - bash scripts/osx-package.sh
+before_deploy:
+  - export RELEASE_PKG_FILE=$(ls *.deb)
+  - echo "deploying $RELEASE_PKG_FILE to GitHub releases"
+deploy:
+  provider: releases
+  api_key:
+    secure: D8tBW0kyHlKf/sXS69aIuexsYTx9auY2DzudKFlfcvdzqat4N2XZqZbZCTVd7YVvptQ8Dj0oZ/p3KUxEGpnJZmlTeJL142rpM/qaNd6wOIMy2yUde/aZl+W9JLFNQp7KHutM+MxObYLzJGihx/8YsupmFx6lxgdngGDXtXYZe/ruDIWDs92ShoKJ4vlce9Csm7eGKv7wv6Z6V9sD5FS3E9J8xdWStHxsbrkPBOflmG+uHU09dpEqzUm+ZYROIoTwig1Xbw3fw+gfjmNrfdSU4fAJcVZI1hrgoenZyJbMfhI2Ej/nZdbZgaXcZNF/eUpqOGgbPe1JljqFnHTbexcE+LPBVyAToScsGMpByHhig67DrZ0nk9gSZoC6CPNl5YS6xub+5dncMJ3P5L03DOGYRu4SL9NczbeuQyKuea7+JPP/8VLwfFDSEqbNEAmgzABAzrdfano+VXtuBuE/Tiy5eE7le9hJu6aSQoKW1SA3cUhMsmr2amzdO96sh+PN8FA1oNr45Yuy0pqOj4SUIkb8JUy4th7vgdhljEkSxrHDK1UcHpxUTp+IIUZkZVVk50aH68dQZxGwSTVOeRxpjrTcEf7VCGaM98qxi/ZK4RW6Ewiq0eo0AxwEeB2Zm841lycGPR/406vM9/ZBzv5IhELIdDdVWTk+dGjJBXB8z5hPJOg=
+  file_glob: true
+  file: "dist/pyfa-*.zip"
+  skip_cleanup: true
+  draft: true
+  on:
+    tags: true
+    repo: pyfa-org/Pyfa

CONTRIBUTING.md

@@ -0,0 +1,107 @@
+# Contribution
+
+## Requirements
+
+- Python 3.7
+- Git CLI installed
+- Python, pip and git are all available as command-line commands (add to the path if needed)
+
+Virtual environment will be created in *PyfaEnv* folder. Project will be cloned and run from the *PyfaDEV* folder. Separate virtual environment will be created so required libraries won't clutter the main python installation.
+
+> Commands and screens were created on Windows 10. Please, update all the paths according to your OS.
+
+## Setting up the project manually
+
+Clone the repository
+```
+git clone <repo> PyfaDEV
+```
+
+Create the virtual environment
+```
+python -m venv PyfaEnv
+```
+
+Activate the virtual environment
+
+```
+For cmd.exe: PyfaEnv\scripts\activate.bat
+For bash: source <venv>/Scripts/activate
+```
+> For other OS check [Python documentation](https://docs.python.org/3/library/venv.html)
+
+Install requirements for the project from *requirements.txt*
+```
+pip install -r PyfaDEV\requirements.txt
+```
+> For some Linux distributions, you may need to install separate wxPython bindings, such as `python-matplotlib-wx`
+
+Check that the libs from *requirements.txt* are installed
+```
+pip list
+```
+
+Build translations and database:
+```
+python scripts\compile_lang.py
+python db_update.py
+```
+
+Test that the project is starting properly
+```
+python PyfaDEV\pyfa.py
+```
+
+
+## Setting up the project with PyCharm/IntelliJ
+
+Install PyCharm / Other IntelliJ product with Python plugin
+
+After launching - select *Check out from Version Control* -> *GIt*
+
+![welcome](https://user-images.githubusercontent.com/54093496/66862580-d8edab00-ef99-11e9-94e2-e93d7043e620.png)
+
+Login to GitHub, paste the repo URL and select the folder to which to clone the project into, press *Clone*.
+
+![Clone](https://user-images.githubusercontent.com/54093496/66862748-38e45180-ef9a-11e9-9f68-4903baf47385.png)
+
+After process is complete, open *File* -> *Settings* -> *Project* -> *Project Interpreter*. 
+
+![Settings](https://user-images.githubusercontent.com/54093496/66862792-544f5c80-ef9a-11e9-9e0f-f64767f3f1b0.png)
+
+Press on options and add new virtual environment.
+
+![venv](https://user-images.githubusercontent.com/54093496/66862833-67622c80-ef9a-11e9-94fa-47cca0158d29.png)
+
+Open project tree view and double-click on the *requirements.txt*. Press *Install requirements*. Install all requirements.
+
+![Reqs](https://user-images.githubusercontent.com/54093496/66862870-7a74fc80-ef9a-11e9-9b18-e64be42c49b8.png)
+
+Create new *Run Configuration*. Set correct *Script path* and *Python interpreter*.
+
+![Run configuraion](https://user-images.githubusercontent.com/54093496/66862970-b4460300-ef9a-11e9-9fb4-20e24759904b.png)
+
+Check that the project is starting properly.
+
+## Running tests
+
+Switch to the proper virtual environment
+```
+For cmd.exe: PyfaEnv\scripts\activate.bat
+For bash: source <venv>/Scripts/activate
+```
+
+Install pytest 
+```
+pip install pytest  
+```
+
+Switch to pyfa directory.
+
+Run tests (any will do)
+```
+python -m pytest
+py.test
+```
+
+More information on tests can be found on appropriate [Wiki page](https://github.com/pyfa-org/Pyfa/wiki/Developers:-Writing-Tests-for-Pyfa).

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:
+

LICENSE

@@ -0,0 +1,674 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program 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.
+
+    This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.

README.md

@@ -0,0 +1,56 @@
+# pyfa
+
+[![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://user-images.githubusercontent.com/275209/66119992-864be080-e5e2-11e9-994a-3a4368c9fad7.png)
+
+## What is it?
+
+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 3 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 project's [releases](https://github.com/pyfa-org/Pyfa/releases) page. Pyfa will notify you if you are running an outdated version.
+
+## Installation
+Windows and OS X users are supplied self-contained builds of pyfa on the [latest releases](https://github.com/pyfa-org/Pyfa/releases/latest) page. An `.exe` installer is also available for Windows builds. Linux users can run pyfa using their distribution's Python interpreter. There is no official self-contained package for Linux, however, there are a number of third-party packages available through distribution-specific repositories.
+
+### OS X
+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:
+```
+$ brew install Caskroom/cask/pyfa
+```
+
+### Linux Distro-specific Packages
+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.
+
+* Arch: https://aur.archlinux.org/packages/pyfa/
+* Gentoo: https://github.com/ZeroPointEnergy/gentoo-pyfa-overlay
+
+## Contribution
+If you wish to help with development or you need to run pyfa through a Python interpreter, check out [the instructions](https://github.com/pyfa-org/Pyfa/blob/master/CONTRIBUTING.md).
+
+## 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](https://forums.eveonline.com/t/27156) on the official EVE Online forums is acceptable. Guidelines for bug reporting can be found on [this wiki page](https://github.com/pyfa-org/Pyfa/wiki/Bug-Reporting). 
+
+## License
+Pyfa is licensed under the GNU GPL v3.0, see LICENSE
+
+## Resources
+* [Development repository](https://github.com/pyfa-org/Pyfa)
+* [EVE forum thread](https://forums.eveonline.com/t/27156)
+* [EVE University guide using pyfa](https://wiki.eveuniversity.org/PYFA)
+* [EVE Online website](http://www.eveonline.com/)
+
+## Contacts:
+* Kadesh / DarkPhoenix
+    * GitHub: @DarkFenX
+    * EVE: Kadesh Priestess
+    * Email: phoenix@mail.ru
+* 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 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,12 @@
+<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_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,61 @@
+  <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="PyUnresolvedReferencesInspection" enabled="true" level="WARNING" enabled_by_default="true">
+      <option name="ignoredIdentifiers">
+        <list>
+          <option value="_" />
+        </list>
+      </option>
+    </inspection_tool>
+    <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,148 @@
+# 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 (KeyboardInterrupt, SystemExit):
+        raise
+    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, miscData, module, override, price, queries, skill, targetProfile, 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
+    from eos.const import FittingModuleState
+    from eos.saveddata.citadel import Citadel
+    from eos.saveddata.booster import Booster
+
+    helper = {
+        'Structure': Citadel,
+        'Ship'     : Ship,
+        'Fit'      : Fit,
+        'Character': Character,
+        'Module'   : Module,
+        'State'    : FittingModuleState,
+        'Booster'  : Booster,
+    }
+    return helper

_development/helpers_fits.py

@@ -0,0 +1,65 @@
+import pytest
+
+# noinspection PyPackageRequirements
+
+
+# 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,11 @@
+import pytest
+
+# noinspection PyPackageRequirements
+
+
+# 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,90 +1,278 @@
-import os
-import sys
-
-# Load variable overrides specific to distribution type
-try:
-    import configforced
-except ImportError:
-    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.6.0"
-tag = "Stable"
-expansionName = "Phoebe"
-expansionVersion = "1.0"
-evemonMinVersion = "4081"
-
-# Database version (int ONLY)
-# Increment every time we need to flag for user database upgrade/modification
-dbversion = 1
-
-pyfaPath = None
-savePath = None
-staticPath = None
-saveDB = None
-gameDB = None
-
-def defPaths():
-    global pyfaPath
-    global savePath
-    global staticPath
-    global saveDB
-    global gameDB
-    global saveInRoot
-    # The main pyfa directory which contains run.py
-    # Python 2.X uses ANSI by default, so we need to convert the character encoding
-    pyfaPath = getattr(configforced, "pyfaPath", pyfaPath)
-    if pyfaPath is None:
-        pyfaPath = unicode(os.path.dirname(os.path.realpath(os.path.abspath(
-            sys.modules['__main__'].__file__))), sys.getfilesystemencoding())
-
-    # Where we store the saved fits etc, default is the current users home directory
-    if saveInRoot is True:
-        savePath = getattr(configforced, "savePath", None)
-        if savePath is None:
-            savePath = os.path.join(pyfaPath, "saveddata")
-    else:
-        savePath = getattr(configforced, "savePath", None)
-        if savePath is None:
-            savePath = unicode(os.path.expanduser(os.path.join("~", ".pyfa")),
-                               sys.getfilesystemencoding())
-
-    # Redirect stderr to file if we're requested to do so
-    stderrToFile = getattr(configforced, "stderrToFile", None)
-    if stderrToFile is True:
-        if not os.path.exists(savePath):
-            os.mkdir(savePath)
-        sys.stderr = open(os.path.join(savePath, "error_log.txt"), "w")
-
-    # Same for stdout
-    stdoutToFile = getattr(configforced, "stdoutToFile", None)
-    if stdoutToFile is True:
-        if not os.path.exists(savePath):
-            os.mkdir(savePath)
-        sys.stdout = open(os.path.join(savePath, "output_log.txt"), "w")
-
-    # Static EVE Data from the staticdata repository, should be in the staticdata
-    # directory in our pyfa directory
-    staticPath = os.path.join(pyfaPath, "staticdata")
-
-    # The database where we store all the fits etc
-    saveDB = os.path.join(savePath, "saveddata.db")
-
-    # The database where the static EVE data from the datadump is kept.
-    # This is not the standard sqlite datadump but a modified version created by eos
-    # maintenance script
-    gameDB = os.path.join(staticPath, "eve.db")
-
-    ## DON'T MODIFY ANYTHING BELOW ##
-    import eos.config
-
-    #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"
+import os
+import sys
+import yaml
+import wx
+
+from logbook import CRITICAL, DEBUG, ERROR, FingersCrossedHandler, INFO, Logger, NestedSetup, NullHandler, \
+    StreamHandler, TimedRotatingFileHandler, WARNING
+import hashlib
+from eos.const import FittingSlot
+
+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
+
+evemonMinVersion = "4081"
+
+minItemSearchLength = 3
+
+pyfaPath = None
+savePath = None
+saveDB = None
+gameDB = None
+imgsZIP = None
+logPath = None
+loggingLevel = None
+logging_setup = None
+cipher = None
+clientHash = None
+experimentalFeatures = None
+version = None
+language = None
+
+ESI_CACHE = 'esi_cache'
+
+LOGLEVEL_MAP = {
+    "critical": CRITICAL,
+    "error": ERROR,
+    "warning": WARNING,
+    "info": INFO,
+    "debug": DEBUG,
+}
+
+CATALOG = 'lang'
+
+slotColourMap = {
+    FittingSlot.LOW: wx.Colour(250, 235, 204),  # yellow = low slots
+    FittingSlot.MED: wx.Colour(188, 215, 241),  # blue   = mid slots
+    FittingSlot.HIGH: wx.Colour(235, 204, 209),  # red    = high slots
+    FittingSlot.RIG: '',
+    FittingSlot.SUBSYSTEM: ''
+}
+
+def getClientSecret():
+    return clientHash
+
+
+def isFrozen():
+    if hasattr(sys, 'frozen'):
+        return True
+    else:
+        return False
+
+
+def __createDirs(path):
+    if not os.path.exists(path):
+        os.makedirs(path)
+
+
+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():
+    return version
+
+
+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 imgsZIP
+    global saveInRoot
+    global logPath
+    global cipher
+    global clientHash
+    global version
+    global experimentalFeatures
+    global language
+
+    pyfalog.debug("Configuring Pyfa")
+
+    # The main pyfa directory which contains run.py
+    # Python 2.X uses ANSI by default, so we need to convert the character encoding
+    pyfaPath = getattr(configforced, "pyfaPath", pyfaPath)
+    if pyfaPath is None:
+        pyfaPath = getPyfaRoot()
+
+    # Version data
+
+    with open(os.path.join(pyfaPath, "version.yml"), 'r') as file:
+        data = yaml.load(file, Loader=yaml.SafeLoader)
+        version = data['version']
+
+    # Where we store the saved fits etc, default is the current users home directory
+    if saveInRoot is True:
+        savePath = getattr(configforced, "savePath", None)
+        if savePath is None:
+            savePath = os.path.join(pyfaPath, "saveddata")
+    else:
+        savePath = getattr(configforced, "savePath", None)
+        if savePath is None:
+            if customSavePath is None:  # customSavePath is not overriden
+                savePath = getDefaultSave()
+            else:
+                savePath = customSavePath
+
+    __createDirs(savePath)
+
+    secret_file = os.path.join(savePath, ".secret")
+    if not os.path.exists(secret_file):
+        with open(secret_file, "wb") as _file:
+            _file.write(Fernet.generate_key())
+
+    with open(secret_file, 'rb') as fp:
+        key = fp.read()
+        clientHash = hashlib.sha3_256(key).hexdigest()
+        cipher = Fernet(key)
+
+    # if isFrozen():
+    #    os.environ["REQUESTS_CA_BUNDLE"] = os.path.join(pyfaPath, "cacert.pem")
+    #    os.environ["SSL_CERT_FILE"] = os.path.join(pyfaPath, "cacert.pem")
+
+    # The database where we store all the fits etc
+    saveDB = os.path.join(savePath, "saveddata.db")
+
+    # The database where the static EVE data from the datadump is kept.
+    # This is not the standard sqlite datadump but a modified version created by eos
+    # maintenance script
+    gameDB = getattr(configforced, "gameDB", gameDB)
+    if not gameDB:
+        gameDB = os.path.join(pyfaPath, "eve.db")
+
+    imgsZIP = getattr(configforced, "imgsZIP", imgsZIP)
+    if not imgsZIP:
+        imgsZIP = os.path.join(pyfaPath, "imgs.zip")
+
+    if debug:
+        logFile = "pyfa_debug.log"
+    else:
+        logFile = "pyfa.log"
+
+    logPath = os.path.join(savePath, logFile)
+
+    experimentalFeatures = getattr(configforced, "experimentalFeatures", experimentalFeatures)
+    if experimentalFeatures is None:
+        experimentalFeatures = False
+
+    # DON'T MODIFY ANYTHING BELOW
+    import eos.config
+
+    # 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"
+
+    # initialize the settings
+    from service.settings import EOSSettings, LocaleSettings
+    eos.config.settings = EOSSettings.getInstance().EOSSettings  # this is kind of confusing, but whatever
+
+    # set langauge, taking the passed argument or falling back to what's saved in the settings
+    localeSettings = LocaleSettings.getInstance()
+    language = language or localeSettings.get('locale')
+
+    # sets the lang for eos, using the mapped langauge.
+    eos.config.set_lang(localeSettings.get_eos_locale())
+
+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 (KeyboardInterrupt, SystemExit):
+        raise
+    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
+            )
+        ])
+
+
+class LoggerWriter:
+    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)

crowdin.yml

@@ -0,0 +1,3 @@
+files:
+  - source: /locale/*.pot
+    translation: /locale/%locale_with_underscore%/LC_MESSAGES/lang.po

db_update.py

@@ -0,0 +1,610 @@
+#!/usr/bin/env python3
+#======================================================================
+# Copyright (C) 2012 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 3 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/>.
+#======================================================================
+
+
+import functools
+import itertools
+import json
+import os
+import re
+import sqlite3
+import sys
+
+
+# todo: need to set the EOS language to en, becasuse this assumes it's being run within an English context
+# Need to know what that would do if called from pyfa
+ROOT_DIR = os.path.realpath(os.path.dirname(__file__))
+DB_PATH = os.path.join(ROOT_DIR, 'eve.db')
+JSON_DIR = os.path.join(ROOT_DIR, 'staticdata')
+if ROOT_DIR not in sys.path:
+    sys.path.insert(0, ROOT_DIR)
+GAMEDATA_SCHEMA_VERSION = 4
+
+
+def db_needs_update():
+    """True if needs, false if it does not, none if we cannot check it."""
+    try:
+        with open(os.path.join(JSON_DIR, 'phobos', 'metadata.0.json')) as f:
+            data_version = next((r['field_value'] for r in json.load(f) if r['field_name'] == 'client_build'))
+    except (KeyboardInterrupt, SystemExit):
+        raise
+    # If we have no source data - return None; should not update in this case
+    except:
+        return None
+    if not os.path.isfile(DB_PATH):
+        print('Gamedata DB not found')
+        return True
+    db_data_version = None
+    db_schema_version = None
+    try:
+        db = sqlite3.connect(DB_PATH)
+        cursor = db.cursor()
+        cursor.execute('SELECT field_value FROM metadata WHERE field_name = \'client_build\'')
+        for row in cursor:
+            db_data_version = int(row[0])
+        cursor.execute('SELECT field_value FROM metadata WHERE field_name = \'schema_version\'')
+        for row in cursor:
+            db_schema_version = int(row[0])
+        cursor.close()
+        db.close()
+    except (KeyboardInterrupt, SystemExit):
+        raise
+    except:
+        print('Error when fetching gamedata DB metadata')
+        return True
+    if data_version != db_data_version:
+        print('Gamedata DB data version mismatch: needed {}, DB has {}'.format(data_version, db_data_version))
+        return True
+    if GAMEDATA_SCHEMA_VERSION != db_schema_version:
+        print('Gamedata DB schema version mismatch: needed {}, DB has {}'.format(GAMEDATA_SCHEMA_VERSION, db_schema_version))
+        return True
+    return False
+
+
+def update_db():
+
+    print('Building gamedata DB...')
+
+    if os.path.isfile(DB_PATH):
+        os.remove(DB_PATH)
+
+    import eos.db
+    import eos.gamedata
+    import eos.config
+
+    # Create the database tables
+    eos.db.gamedata_meta.create_all()
+
+    def _readData(minerName, jsonName, keyIdName=None):
+        compiled_data = None
+        for i in itertools.count(0):
+            try:
+                with open(os.path.join(JSON_DIR, minerName, '{}.{}.json'.format(jsonName, i)), encoding='utf-8') as f:
+                    rawData = json.load(f)
+                    if i == 0:
+                        compiled_data = {} if type(rawData) == dict else []
+                    if type(rawData) == dict:
+                        compiled_data.update(rawData)
+                    else:
+                        compiled_data.extend(rawData)
+            except FileNotFoundError:
+                break
+
+        if not keyIdName:
+            return compiled_data
+        # IDs in keys, rows in values
+        data = []
+        for k, v in compiled_data.items():
+            row = {}
+            row.update(v)
+            if keyIdName not in row:
+                row[keyIdName] = int(k)
+            data.append(row)
+        return data
+
+    def _addRows(data, cls, fieldMap=None):
+        if fieldMap is None:
+            fieldMap = {}
+        for row in data:
+            instance = cls()
+            for k, v in row.items():
+                if isinstance(v, str):
+                    v = v.strip()
+                setattr(instance, fieldMap.get(k, k), v)
+            eos.db.gamedata_session.add(instance)
+
+    def processEveTypes():
+        print('processing evetypes')
+        data = _readData('fsd_lite', 'evetypes', keyIdName='typeID')
+        for row in data:
+            if (
+                # Apparently people really want Civilian modules available
+                (row['typeName_en-us'].startswith('Civilian') and "Shuttle" not in row['typeName_en-us']) or
+                row['typeName_en-us'] == 'Capsule' or
+                row['groupID'] == 4033  # destructible effect beacons
+            ):
+                row['published'] = True
+            # Nearly useless and clutter search results too much
+            elif (
+                row['typeName_en-us'].startswith('Limited Synth ') or
+                row['typeName_en-us'].endswith(' Filament') and (
+                    "'Needlejack'" not in row['typeName_en-us'] and
+                    "'Devana'" not in row['typeName_en-us'] and
+                    "'Pochven'" not in row['typeName_en-us'] and
+                    "'Krai Veles'" not in row['typeName_en-us'] and
+                    "'Krai Perun'" not in row['typeName_en-us'] and
+                    "'Krai Svarog'" not in row['typeName_en-us']
+                )
+            ):
+                row['published'] = False
+
+        newData = []
+        for row in data:
+            if (
+                row['published'] or
+                # group Ship Modifiers, for items like tactical t3 ship modes
+                row['groupID'] == 1306 or
+                # Micro Bombs (Fighters)
+                row['typeID'] in (41549, 41548, 41551, 41550) or
+                # Abyssal weather (environment)
+                row['groupID'] in (
+                    1882,
+                    1975,
+                    1971,
+                    1983)  # the "container" for the abyssal environments
+            ):
+                newData.append(row)
+        map = {'typeName_en-us': 'typeName', 'description_en-us': '_description'}
+        map.update({'description'+v: '_description'+v for (k, v) in eos.config.translation_mapping.items() if k != 'en'})
+        _addRows(newData, eos.gamedata.Item, fieldMap=map)
+        return newData
+
+    def processEveGroups():
+        print('processing evegroups')
+        data = _readData('fsd_lite', 'evegroups', keyIdName='groupID')
+        map = {'groupName_en-us': 'name'}
+        map.update({'groupName'+v: 'name'+v for (k, v) in eos.config.translation_mapping.items() if k != 'en'})
+        _addRows(data, eos.gamedata.Group, fieldMap=map)
+        return data
+
+    def processEveCategories():
+        print('processing evecategories')
+        data = _readData('fsd_lite', 'evecategories', keyIdName='categoryID')
+        map = { 'categoryName_en-us': 'name' }
+        map.update({'categoryName'+v: 'name'+v for (k, v) in eos.config.translation_mapping.items() if k != 'en'})
+        _addRows(data, eos.gamedata.Category, fieldMap=map)
+
+    def processDogmaAttributes():
+        print('processing dogmaattributes')
+        data = _readData('fsd_binary', 'dogmaattributes', keyIdName='attributeID')
+        map = {
+            'displayName_en-us': 'displayName',
+            # 'tooltipDescription_en-us': 'tooltipDescription'
+        }
+        _addRows(data, eos.gamedata.AttributeInfo, fieldMap=map)
+
+    def processDogmaTypeAttributes(eveTypesData):
+        print('processing dogmatypeattributes')
+        data = _readData('fsd_binary', 'typedogma', keyIdName='typeID')
+        eveTypeIds = set(r['typeID'] for r in eveTypesData)
+        newData = []
+        seenKeys = set()
+
+        def checkKey(key):
+            if key in seenKeys:
+                return False
+            seenKeys.add(key)
+            return True
+
+        for typeData in data:
+            if typeData['typeID'] not in eveTypeIds:
+                continue
+            for row in typeData.get('dogmaAttributes', ()):
+                row['typeID'] = typeData['typeID']
+                if checkKey((row['typeID'], row['attributeID'])):
+                    newData.append(row)
+        for row in eveTypesData:
+            for attrId, attrName in {4: 'mass', 38: 'capacity', 161: 'volume', 162: 'radius'}.items():
+                if attrName in row and checkKey((row['typeID'], attrId)):
+                    newData.append({'typeID': row['typeID'], 'attributeID': attrId, 'value': row[attrName]})
+
+        _addRows(newData, eos.gamedata.Attribute)
+        return newData
+
+    def processDynamicItemAttributes():
+        print('processing dynamicitemattributes')
+        data = _readData('fsd_binary', 'dynamicitemattributes')
+        for mutaID, mutaData in data.items():
+            muta = eos.gamedata.DynamicItem()
+            muta.typeID = mutaID
+            muta.resultingTypeID = mutaData['inputOutputMapping'][0]['resultingType']
+            eos.db.gamedata_session.add(muta)
+
+            for x in mutaData['inputOutputMapping'][0]['applicableTypes']:
+                item = eos.gamedata.DynamicItemItem()
+                item.typeID = mutaID
+                item.applicableTypeID = x
+                eos.db.gamedata_session.add(item)
+
+            for attrID, attrData in mutaData['attributeIDs'].items():
+                attr = eos.gamedata.DynamicItemAttribute()
+                attr.typeID = mutaID
+                attr.attributeID = attrID
+                attr.min = attrData['min']
+                attr.max = attrData['max']
+                eos.db.gamedata_session.add(attr)
+
+    def processDogmaEffects():
+        print('processing dogmaeffects')
+        data = _readData('fsd_binary', 'dogmaeffects', keyIdName='effectID')
+        _addRows(data, eos.gamedata.Effect, fieldMap={'resistanceAttributeID': 'resistanceID'})
+
+    def processDogmaTypeEffects(eveTypesData):
+        print('processing dogmatypeeffects')
+        data = _readData('fsd_binary', 'typedogma', keyIdName='typeID')
+        eveTypeIds = set(r['typeID'] for r in eveTypesData)
+        newData = []
+        for typeData in data:
+            if typeData['typeID'] not in eveTypeIds:
+                continue
+            for row in typeData.get('dogmaEffects', ()):
+                row['typeID'] = typeData['typeID']
+                newData.append(row)
+        _addRows(newData, eos.gamedata.ItemEffect)
+        return newData
+
+    def processDogmaUnits():
+        print('processing dogmaunits')
+        data = _readData('fsd_binary', 'dogmaunits', keyIdName='unitID')
+        _addRows(data, eos.gamedata.Unit, fieldMap={
+            'name': 'unitName',
+            'displayName_en-us': 'displayName'
+        })
+
+    def processMarketGroups():
+        print('processing marketgroups')
+        data = _readData('fsd_binary', 'marketgroups', keyIdName='marketGroupID')
+        map = {
+            'name_en-us': 'marketGroupName',
+            'description_en-us': '_description',
+        }
+        map.update({'name'+v: 'marketGroupName'+v for (k, v) in eos.config.translation_mapping.items() if k != 'en'})
+        map.update({'description' + v: '_description' + v for (k, v) in eos.config.translation_mapping.items() if k != 'en'})
+        _addRows(data, eos.gamedata.MarketGroup, fieldMap=map)
+
+    def processMetaGroups():
+        print('processing metagroups')
+        data = _readData('fsd_binary', 'metagroups', keyIdName='metaGroupID')
+        map = {'name_en-us': 'metaGroupName'}
+        map.update({'name' + v: 'metaGroupName' + v for (k, v) in eos.config.translation_mapping.items() if k != 'en'})
+        _addRows(data, eos.gamedata.MetaGroup, fieldMap=map)
+
+    def processCloneGrades():
+        print('processing clonegrades')
+        data = _readData('fsd_lite', 'clonegrades')
+
+        newData = []
+        # December, 2017 - CCP decided to use only one set of skill levels for alpha clones. However, this is still
+        # represented in the data as a skillset per race. To ensure that all skills are the same, we store them in a way
+        # that we can check to make sure all races have the same skills, as well as skill levels
+        check = {}
+        for ID in data:
+            for skill in data[ID]['skills']:
+                newData.append({
+                    'alphaCloneID': int(ID),
+                    'alphaCloneName': 'Alpha Clone',
+                    'typeID': skill['typeID'],
+                    'level': skill['level']})
+                if ID not in check:
+                    check[ID] = {}
+                check[ID][int(skill['typeID'])] = int(skill['level'])
+        if not functools.reduce(lambda a, b: a if a == b else False, [v for _, v in check.items()]):
+            raise Exception('Alpha Clones not all equal')
+        newData = [x for x in newData if x['alphaCloneID'] == 1]
+        if len(newData) == 0:
+            raise Exception('Alpha Clone processing failed')
+
+        tmp = []
+        for row in newData:
+            if row['alphaCloneID'] not in tmp:
+                cloneParent = eos.gamedata.AlphaClone()
+                setattr(cloneParent, 'alphaCloneID', row['alphaCloneID'])
+                setattr(cloneParent, 'alphaCloneName', row['alphaCloneName'])
+                eos.db.gamedata_session.add(cloneParent)
+                tmp.append(row['alphaCloneID'])
+        _addRows(newData, eos.gamedata.AlphaCloneSkill)
+
+    def processTraits():
+        print('processing traits')
+        data = _readData('phobos', 'traits')
+
+        def convertSection(sectionData):
+            sectionLines = []
+            headerText = '<b>{}</b>'.format(sectionData['header'])
+            sectionLines.append(headerText)
+            for bonusData in sectionData['bonuses']:
+                prefix = '{} '.format(bonusData['number']) if 'number' in bonusData else ''
+                bonusText = '{}{}'.format(prefix, bonusData['text'].replace('\u00B7', '\u2022 '))
+                sectionLines.append(bonusText)
+            sectionLine = '<br />\n'.join(sectionLines)
+            return sectionLine
+
+        newData = []
+        for row in data:
+            try:
+                newRow = {
+                    'typeID': row['typeID'],
+                }
+                for (k, v) in eos.config.translation_mapping.items():
+                    if v == '':
+                        v = '_en-us'
+                    typeLines = []
+                    traitData = row['traits{}'.format(v)]
+                    for skillData in sorted(traitData.get('skills', ()), key=lambda i: i['header']):
+                        typeLines.append(convertSection(skillData))
+                    if 'role' in traitData:
+                        typeLines.append(convertSection(traitData['role']))
+                    if 'misc' in traitData:
+                        typeLines.append(convertSection(traitData['misc']))
+                    traitLine = '<br />\n<br />\n'.join(typeLines)
+                    newRow['traitText{}'.format(v)] = traitLine
+
+                newData.append(newRow)
+            except:
+                pass
+        _addRows(newData, eos.gamedata.Traits, fieldMap={'traitText_en-us': 'traitText'})
+
+    def processMetadata():
+        print('processing metadata')
+        data = _readData('phobos', 'metadata')
+        _addRows(data, eos.gamedata.MetaData)
+
+    def processReqSkills(eveTypesData):
+        print('processing requiredskillsfortypes')
+
+        def composeReqSkills(raw):
+            reqSkills = {}
+            for skillTypeID, skillLevel in raw.items():
+                reqSkills[int(skillTypeID)] = skillLevel
+            return reqSkills
+
+        eveTypeIds = set(r['typeID'] for r in eveTypesData)
+        data = _readData('fsd_binary', 'requiredskillsfortypes')
+        reqsByItem = {}
+        itemsByReq = {}
+        for typeID, skillreqData in data.items():
+            typeID = int(typeID)
+            if typeID not in eveTypeIds:
+                continue
+            for skillTypeID, skillLevel in composeReqSkills(skillreqData).items():
+                reqsByItem.setdefault(typeID, {})[skillTypeID] = skillLevel
+                itemsByReq.setdefault(skillTypeID, {})[typeID] = skillLevel
+        for item in eos.db.gamedata_session.query(eos.gamedata.Item).all():
+            if item.typeID in reqsByItem:
+                item.reqskills = json.dumps(reqsByItem[item.typeID])
+            if item.typeID in itemsByReq:
+                item.requiredfor = json.dumps(itemsByReq[item.typeID])
+
+    def processReplacements(eveTypesData, eveGroupsData, dogmaTypeAttributesData, dogmaTypeEffectsData):
+        print('finding item replacements')
+
+        def compareAttrs(attrs1, attrs2):
+            # Consider items as different if they have no attrs
+            if len(attrs1) == 0 and len(attrs2) == 0:
+                return False
+            if set(attrs1) != set(attrs2):
+                return False
+            if all(attrs1[aid] == attrs2[aid] for aid in attrs1):
+                return True
+            return False
+
+        skillReqAttribs = {
+            182: 277,
+            183: 278,
+            184: 279,
+            1285: 1286,
+            1289: 1287,
+            1290: 1288}
+        skillReqAttribsFlat = set(skillReqAttribs.keys()).union(skillReqAttribs.values())
+        # Get data on type groups
+        # Format: {type ID: group ID}
+        typesGroups = {}
+        for row in eveTypesData:
+            typesGroups[row['typeID']] = row['groupID']
+        # Get data on item effects
+        # Format: {type ID: set(effect, IDs)}
+        typesEffects = {}
+        for row in dogmaTypeEffectsData:
+            typesEffects.setdefault(row['typeID'], set()).add(row['effectID'])
+        # Get data on type attributes
+        # Format: {type ID: {attribute ID: attribute value}}
+        typesNormalAttribs = {}
+        typesSkillAttribs = {}
+        for row in dogmaTypeAttributesData:
+            attributeID = row['attributeID']
+            if attributeID in skillReqAttribsFlat:
+                typeSkillAttribs = typesSkillAttribs.setdefault(row['typeID'], {})
+                typeSkillAttribs[row['attributeID']] = row['value']
+            # Ignore these attributes for comparison purposes
+            elif attributeID in (
+                # We do not need mass as it affects final ship stats only when carried by ship itself
+                # (and we're not going to replace ships), but it's wildly inconsistent for other items,
+                # which otherwise would be the same
+                4,  # mass
+                124,  # mainColor
+                162,  # radius
+                422,  # techLevel
+                633,  # metaLevel
+                1692,  # metaGroupID
+                1768  # typeColorScheme
+            ):
+                continue
+            else:
+                typeNormalAttribs = typesNormalAttribs.setdefault(row['typeID'], {})
+                typeNormalAttribs[row['attributeID']] = row['value']
+        # Get data on skill requirements
+        # Format: {type ID: {skill type ID: skill level}}
+        typesSkillReqs = {}
+        for typeID, typeAttribs in typesSkillAttribs.items():
+            typeSkillAttribs = typesSkillAttribs.get(typeID, {})
+            if not typeSkillAttribs:
+                continue
+            typeSkillReqs = typesSkillReqs.setdefault(typeID, {})
+            for skillreqTypeAttr, skillreqLevelAttr in skillReqAttribs.items():
+                try:
+                    skillType = int(typeSkillAttribs[skillreqTypeAttr])
+                    skillLevel = int(typeSkillAttribs[skillreqLevelAttr])
+                except (KeyError, ValueError):
+                    continue
+                typeSkillReqs[skillType] = skillLevel
+        # Format: {group ID: category ID}
+        groupCategories = {}
+        for row in eveGroupsData:
+            groupCategories[row['groupID']] = row['categoryID']
+        # As EVE affects various types mostly depending on their group or skill requirements,
+        # we're going to group various types up this way
+        # Format: {(group ID, frozenset(skillreq, type, IDs), frozenset(type, effect, IDs): [type ID, {attribute ID: attribute value}]}
+        groupedData = {}
+        for row in eveTypesData:
+            typeID = row['typeID']
+            # Ignore items outside of categories we need
+            if groupCategories[typesGroups[typeID]] not in (
+                6,  # Ship
+                7,  # Module
+                8,  # Charge
+                18,  # Drone
+                20,  # Implant
+                22,  # Deployable
+                23,  # Starbase
+                32,  # Subsystem
+                35,  # Decryptors
+                65,  # Structure
+                66,  # Structure Module
+                87,  # Fighter
+            ):
+                continue
+            typeAttribs = typesNormalAttribs.get(typeID, {})
+            # Ignore items w/o attributes
+            if not typeAttribs:
+                continue
+            # We need only skill types, not levels for keys
+            typeSkillreqs = frozenset(typesSkillReqs.get(typeID, {}))
+            typeGroup = typesGroups[typeID]
+            typeEffects = frozenset(typesEffects.get(typeID, ()))
+            groupData = groupedData.setdefault((typeGroup, typeSkillreqs, typeEffects), [])
+            groupData.append((typeID, typeAttribs))
+        # Format: {type ID: set(type IDs)}
+        replacements = {}
+        # Now, go through composed groups and for every item within it
+        # find items which are the same
+        for groupData in groupedData.values():
+            for type1, type2 in itertools.combinations(groupData, 2):
+                if compareAttrs(type1[1], type2[1]):
+                    replacements.setdefault(type1[0], set()).add(type2[0])
+                    replacements.setdefault(type2[0], set()).add(type1[0])
+        # Update DB session with data we generated
+        for item in eos.db.gamedata_session.query(eos.gamedata.Item).all():
+            itemReplacements = replacements.get(item.typeID)
+            if itemReplacements is not None:
+                item.replacements = ','.join('{}'.format(tid) for tid in sorted(itemReplacements))
+
+    def processImplantSets(eveTypesData):
+        print('composing implant sets')
+        # Includes only implants which can be considered part of sets, not all implants
+        implant_groups = (300, 1730)
+        specials = {'Genolution': ('Genolution Core Augmentation', r'CA-\d+')}
+        implantSets = {}
+        for row in eveTypesData:
+            if not row.get('published'):
+                continue
+            if row.get('groupID') not in implant_groups:
+                continue
+            typeName = row.get('typeName_en-us', '')
+            # Regular sets matching
+            m = re.match('(?P<grade>(High|Mid|Low)-grade) (?P<set>\w+) (?P<implant>(Alpha|Beta|Gamma|Delta|Epsilon|Omega))', typeName, re.IGNORECASE)
+            if m:
+                implantSets.setdefault((m.group('grade'), m.group('set')), set()).add(row['typeID'])
+            # Special set matching
+            for setHandle, (setName, implantPattern) in specials.items():
+                pattern = '(?P<set>{}) (?P<implant>{})'.format(setName, implantPattern)
+                m = re.match(pattern, typeName)
+                if m:
+                    implantSets.setdefault((None, setHandle), set()).add(row['typeID'])
+                    break
+        data = []
+        for (gradeName, setName), implants in implantSets.items():
+            if len(implants) < 2:
+                continue
+            implants = ','.join('{}'.format(tid) for tid in sorted(implants))
+            row = {'setName': setName, 'gradeName': gradeName, 'implants': implants}
+            data.append(row)
+        _addRows(data, eos.gamedata.ImplantSet)
+
+    eveTypesData = processEveTypes()
+    eveGroupsData = processEveGroups()
+    processEveCategories()
+    processDogmaAttributes()
+    dogmaTypeAttributesData = processDogmaTypeAttributes(eveTypesData)
+    processDynamicItemAttributes()
+    processDogmaEffects()
+    dogmaTypeEffectsData = processDogmaTypeEffects(eveTypesData)
+    processDogmaUnits()
+    processMarketGroups()
+    processMetaGroups()
+    processCloneGrades()
+    processTraits()
+    processMetadata()
+
+    eos.db.gamedata_session.flush()
+    processReqSkills(eveTypesData)
+    processReplacements(eveTypesData, eveGroupsData, dogmaTypeAttributesData, dogmaTypeEffectsData)
+    processImplantSets(eveTypesData)
+
+    # Add schema version to prevent further updates
+    metadata_schema_version = eos.gamedata.MetaData()
+    metadata_schema_version.field_name = 'schema_version'
+    metadata_schema_version.field_value = GAMEDATA_SCHEMA_VERSION
+    eos.db.gamedata_session.add(metadata_schema_version)
+
+    eos.db.gamedata_session.flush()
+
+    # CCP still has 5 subsystems assigned to T3Cs, even though only 4 are available / usable. They probably have some
+    # old legacy requirement or assumption that makes it difficult for them to change this value in the data. But for
+    # pyfa, we can do it here as a post-processing step
+    for attr in eos.db.gamedata_session.query(eos.gamedata.Attribute).filter(eos.gamedata.Attribute.ID == 1367).all():
+        attr.value = 4.0
+    for item in eos.db.gamedata_session.query(eos.gamedata.Item).filter(eos.gamedata.Item.name.like('%abyssal%')).all():
+        item.published = False
+
+    for x in [
+        30  # Apparel
+    ]:
+        cat = eos.db.gamedata_session.query(eos.gamedata.Category).filter(eos.gamedata.Category.ID == x).first()
+        print ('Removing Category: {}'.format(cat.name))
+        eos.db.gamedata_session.delete(cat)
+
+    eos.db.gamedata_session.commit()
+    eos.db.gamedata_engine.execute('VACUUM')
+
+    print('done')
+
+
+if __name__ == '__main__':
+    update_db()

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,92 @@
+# -*- 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'),
+             ('../../locale', 'locale'),
+             (requests.certs.where(), '.'),  # is this needed anymore?
+             ('../../eve.db', '.'),
+             ('../../README.md', '.'),
+             ('../../LICENSE', '.'),
+             ('../../version.yml', '.'),
+             ]
+
+
+import_these = [
+    'numpy.core._dtype_ctypes',  # https://github.com/pyinstaller/pyinstaller/issues/3982
+    'sqlalchemy.ext.baked',  # windows build doesn't launch without if when using sqlalchemy 1.3.x
+    'pkg_resources.py2_warn'  # issue 2156
+]
+
+icon = os.path.join(os.getcwd(), "dist_assets", "mac", "pyfa.icns")
+
+# Walk directories that do dynamic importing
+paths = ('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=icon,
+          )
+
+app = BUNDLE(
+    exe,
+    name='pyfa.app',
+    icon=icon,
+    bundle_identifier=None,
+    info_plist={
+        'NSHighResolutionCapable': 'True',
+        'NSPrincipalClass': 'NSApplication',
+        'CFBundleName': 'pyfa',
+        'CFBundleDisplayName': 'pyfa',
+        'CFBundleIdentifier': 'org.pyfaorg.pyfa',
+    }
+)

dist_assets/win/dist.py

@@ -0,0 +1,37 @@
+# helper script to zip up pyinstaller distribution and create installer file
+
+import os.path
+from subprocess import call
+import zipfile
+from packaging.version import Version
+import yaml
+
+
+with open("version.yml", 'r') as file:
+    data = yaml.load(file, Loader=yaml.SafeLoader)
+    version = data['version']
+
+os.environ["PYFA_DIST_DIR"] = os.path.join(os.getcwd(), 'dist')
+
+os.environ["PYFA_VERSION"] = version
+iscc = "C:\Program Files (x86)\Inno Setup 6\ISCC.exe"
+
+source = os.path.join(os.environ["PYFA_DIST_DIR"], "pyfa")
+
+fileName = "pyfa-{}-win".format(os.environ["PYFA_VERSION"])
+
+print("Compiling EXE")
+
+v = Version(version)
+
+print(v)
+
+call([
+    iscc,
+    os.path.join(os.getcwd(), "dist_assets", "win", "pyfa-setup.iss"),
+    "/dMyAppVersion=%s" % v,
+    "/dMyAppDir=%s" % source,
+    "/dMyOutputDir=%s" % os.path.join(os.getcwd()),
+    "/dMyOutputFile=%s" % fileName])  # stdout=devnull, stderr=devnull
+
+print("Done")

dist_assets/win/pyfa-setup.iss

@@ -0,0 +1,187 @@
+; Script generated by the Inno Setup Script Wizard.
+; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
+
+; Versioning
+; we do some #ifdef conditionals because automated compilation passes these as arguments
+
+#ifndef MyAppVersion
+    #define MyAppVersion "2.1.0"
+#endif
+
+; Other config
+
+#define MyAppName "pyfa"
+#define MyAppPublisher "pyfa"
+#define MyAppURL "https://github.com/pyfa-org/Pyfa/"
+#define MyAppExeName "pyfa.exe"
+
+#ifndef MyOutputFile
+    #define MyOutputFile LowerCase(StringChange(MyAppName+'-'+MyAppVersion+'-win', " ", "-"))
+#endif
+#ifndef MyAppDir
+    #define MyAppDir "pyfa"
+#endif
+#ifndef MyOutputDir
+    #define MyOutputDir "dist"
+#endif
+
+[Setup]
+; NOTE: The value of AppId uniquely identifies this application.
+; Do not use the same AppId value in installers for other applications.
+; (To generate a new GUID, click Tools | Generate GUID inside the IDE.)
+AppId={{3DA39096-C08D-49CD-90E0-1D177F32C8AA}
+AppName={#MyAppName}
+AppVersion={#MyAppVersion}
+AppPublisher={#MyAppPublisher}
+AppPublisherURL={#MyAppURL}
+AppSupportURL={#MyAppURL}
+AppUpdatesURL={#MyAppURL}
+ArchitecturesAllowed=x64
+ArchitecturesInstallIn64BitMode=x64
+CloseApplications=yes
+DefaultDirName={pf}\{#MyAppName}
+DefaultGroupName={#MyAppName}
+AllowNoIcons=yes
+LicenseFile={#MyAppDir}\LICENSE
+OutputDir={#MyOutputDir}
+OutputBaseFilename={#MyOutputFile}
+SetupIconFile={#MyAppDir}\pyfa.ico
+SolidCompression=yes
+
+[Languages]
+Name: "english"; MessagesFile: "compiler:Default.isl"
+
+[Tasks]
+Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
+Name: "quicklaunchicon"; Description: "{cm:CreateQuickLaunchIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked; OnlyBelowVersion: 0,6.1
+
+[Files]
+Source: "{#MyAppDir}\pyfa.exe"; DestDir: "{app}"; Flags: ignoreversion; AfterInstall: RemoveFromVirtualStore
+Source: "{#MyAppDir}\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
+; NOTE: Don't use "Flags: ignoreversion" on any shared system files
+
+[Icons]
+Name: "{group}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"
+Name: "{group}\{cm:UninstallProgram,{#MyAppName}}"; Filename: "{uninstallexe}"
+Name: "{commondesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: desktopicon
+Name: "{userappdata}\Microsoft\Internet Explorer\Quick Launch\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: quicklaunchicon
+
+[Run]
+Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"; Flags: nowait postinstall skipifsilent
+
+[InstallDelete]
+; These will delete left over generated files from 1.14 and below
+Type: filesandordirs; Name: "{app}\eos"
+Type: filesandordirs; Name: "{app}\gui"
+Type: filesandordirs; Name: "{app}\service"
+Type: filesandordirs; Name: "{app}\utils"
+Type: files; Name: "{app}\*.pyo"
+Type: files; Name: "{app}\*.pyc"
+
+[Code]
+
+/////////////////////////////////////////////////////////////////////
+function IsAppRunning(const FileName : string): Boolean;
+var
+    FSWbemLocator: Variant;
+    FWMIService   : Variant;
+    FWbemObjectSet: Variant;
+begin
+    Result := false;
+    FSWbemLocator := CreateOleObject('WBEMScripting.SWBEMLocator');
+    FWMIService := FSWbemLocator.ConnectServer('', 'root\CIMV2', '', '');
+    FWbemObjectSet := FWMIService.ExecQuery(Format('SELECT Name FROM Win32_Process Where Name="%s"',[FileName]));
+    Result := (FWbemObjectSet.Count > 0);
+    FWbemObjectSet := Unassigned;
+    FWMIService := Unassigned;
+    FSWbemLocator := Unassigned;
+end;
+
+/////////////////////////////////////////////////////////////////////
+procedure RemoveFromVirtualStore;
+var
+    VirtualStore,FileName,FilePath:String;
+    DriveChars:Integer;
+begin
+    VirtualStore:=AddBackslash(ExpandConstant('{localappdata}'))+'VirtualStore';
+    FileName:=ExpandConstant(CurrentFileName);
+    DriveChars:=Length(ExtractFileDrive(FileName));
+    if DriveChars>0 then begin
+        Delete(FileName,1,DriveChars);
+        FileName:=VirtualStore+FileName;
+        FilePath:=ExtractFilePath(FileName);
+        DelTree(FilePath, True, True, True);
+    end;
+end;
+
+/////////////////////////////////////////////////////////////////////
+function PrepareToInstall(var NeedsRestart: Boolean): String;
+begin
+  if(IsAppRunning( 'pyfa.exe' )) then
+    begin
+      Result := 'Please close pyfa before continuing. When closed, please go back to the previous step and continue. If you have named this installer pyfa.exe, please rename it and restart installation';
+    end
+  else
+    begin
+      Result := '';
+    end
+end;
+
+/////////////////////////////////////////////////////////////////////
+function GetUninstallString(): String;
+var
+  sUnInstPath: String;
+  sUnInstallString: String;
+begin
+  sUnInstPath := ExpandConstant('Software\Microsoft\Windows\CurrentVersion\Uninstall\{{3DA39096-C08D-49CD-90E0-1D177F32C8AA}_is1'); //Your App GUID/ID
+  sUnInstallString := '';
+  if not RegQueryStringValue(HKLM, sUnInstPath, 'UninstallString', sUnInstallString) then
+    if not RegQueryStringValue(HKCU, sUnInstPath, 'UninstallString', sUnInstallString) then
+      if not RegQueryStringValue(HKLM32, sUnInstPath, 'UninstallString', sUnInstallString) then
+        RegQueryStringValue(HKCU32, sUnInstPath, 'UninstallString', sUnInstallString);
+  Result := sUnInstallString;
+end;
+
+/////////////////////////////////////////////////////////////////////
+function UnInstallOldVersion(): Integer;
+var
+  sUnInstallString: String;
+  iResultCode: Integer;
+begin
+// Return Values:
+// 1 - uninstall string is empty
+// 2 - error executing the UnInstallString
+// 3 - successfully executed the UnInstallString
+
+  // default return value
+  Result := 0;
+
+  // get the uninstall string of the old app
+  sUnInstallString := GetUninstallString();
+  if sUnInstallString <> '' then begin
+    sUnInstallString := RemoveQuotes(sUnInstallString);
+    if Exec(sUnInstallString, '/SILENT /NORESTART /SUPPRESSMSGBOXES','', SW_HIDE, ewWaitUntilTerminated, iResultCode) then
+      Result := 3
+    else
+      Result := 2;
+  end else
+    Result := 1;
+end;
+
+/////////////////////////////////////////////////////////////////////
+function IsUpgrade(): Boolean;
+begin
+  Result := (GetUninstallString() <> '');
+end;
+
+/////////////////////////////////////////////////////////////////////
+procedure CurStepChanged(CurStep: TSetupStep);
+begin
+  if (CurStep=ssInstall) then
+  begin
+    if (IsUpgrade()) then
+    begin
+      UnInstallOldVersion();
+    end;
+  end;
+end;

dist_assets/win/pyfa.exe.manifest

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+  <assemblyIdentity name="pyfa" processorArchitecture="x86" type="win32" version="1.0.0.0"/>
+  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
+    <security>
+      <requestedPrivileges>
+        <requestedExecutionLevel level="asInvoker" uiAccess="false"></requestedExecutionLevel>
+      </requestedPrivileges>
+    </security>
+  </trustInfo>
+  <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+    <application>
+      <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/>
+      <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
+      <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
+      <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
+      <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
+    </application>
+  </compatibility>
+</assembly>

dist_assets/win/pyfa.spec

@@ -0,0 +1,87 @@
+# -*- 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', '.'),
+             ('../../dist_assets/win/pyfa.exe.manifest', '.'),
+             (requests.certs.where(), '.'),  # is this needed anymore?
+             ('../../eve.db', '.'),
+             ('../../README.md', '.'),
+             ('../../LICENSE', '.'),
+             ('../../version.yml', '.'),
+             ]
+
+import_these = [
+    'numpy.core._dtype_ctypes',  # https://github.com/pyinstaller/pyinstaller/issues/3982
+    'sqlalchemy.ext.baked',  # windows build doesn't launch without if when using sqlalchemy 1.3.x
+    'pkg_resources.py2_warn'  # issue 2156
+]
+
+# Walk directories that do dynamic importing
+paths = ('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/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"
-tag = "git"
-
-def test():
-    import tests.runTests
-    import unittest
-    unittest.main(defaultTest="discover", testLoader=tests.runTests.loader)
+version = "0.2.3"
+tag = "git"

eos/calc.py

@@ -0,0 +1,71 @@
+# =============================================================================
+# Copyright (C) 2019 Ryan Holmes
+#
+# 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 math
+
+
+# Just copy-paste penalization chain calculation code (with some modifications,
+# as multipliers arrive in different form) in here to not make actual attribute
+# calculations slower than they already are due to extra function calls
+def calculateMultiplier(multipliers):
+    """
+    multipliers: dictionary in format:
+    {stacking group name: [(mult, resist attr ID), (mult, resist attr ID)]}
+    """
+    val = 1
+    for penalizedMultipliers in multipliers.values():
+        # A quick explanation of how this works:
+        # 1: Bonuses and penalties are calculated seperately, so we'll have to filter each of them
+        l1 = [v[0] for v in penalizedMultipliers if v[0] > 1]
+        l2 = [v[0] for v in penalizedMultipliers if v[0] < 1]
+        # 2: The most significant bonuses take the smallest penalty,
+        # This means we'll have to sort
+        abssort = lambda _val: -abs(_val - 1)
+        l1.sort(key=abssort)
+        l2.sort(key=abssort)
+        # 3: The first module doesn't get penalized at all
+        # Any module after the first takes penalties according to:
+        # 1 + (multiplier - 1) * math.exp(- math.pow(i, 2) / 7.1289)
+        for l in (l1, l2):
+            for i in range(len(l)):
+                bonus = l[i]
+                val *= 1 + (bonus - 1) * math.exp(- i ** 2 / 7.1289)
+    return val
+
+
+def calculateRangeFactor(srcOptimalRange, srcFalloffRange, distance, restrictedRange=True):
+    """Range strength/chance factor, applicable to guns, ewar, RRs, etc."""
+    if distance is None:
+        return 1
+    if srcFalloffRange > 0:
+        # Most modules cannot be activated when at 3x falloff range, with few exceptions like guns
+        if restrictedRange and distance > srcOptimalRange + 3 * srcFalloffRange:
+            return 0
+        return 0.5 ** ((max(0, distance - srcOptimalRange) / srcFalloffRange) ** 2)
+    elif distance <= srcOptimalRange:
+        return 1
+    else:
+        return 0
+
+
+def calculateLockTime(srcScanRes, tgtSigRadius):
+    if not srcScanRes or not tgtSigRadius:
+        return None
+    return min(40000 / srcScanRes / math.asinh(tgtSigRadius) ** 2, 30 * 60)

eos/capSim.py

@@ -1,18 +1,19 @@
 import heapq
-from math import sqrt, exp
 import time
-
+from math import sqrt, exp
+from collections import Counter
 
 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
 
 
-class CapSimulator(object):
+class CapSimulator:
     """Entity's EVE Capacitor Simulator"""
 
     def __init__(self):
@@ -20,6 +21,7 @@ class CapSimulator(object):
 
         self.capacitorCapacity = 100
         self.capacitorRecharge = 1000
+        self.startingCapacity = 1000
 
         # max simulated time.
         self.t_max = DAY
@@ -40,78 +42,103 @@ class CapSimulator(object):
         # relevant decimal digits of capacitor for LCM period optimization
         self.stability_precision = 1
 
+        # Stores how cap sim changed cap values outside of cap regen time
+        self.saved_changes = ()
+        self.saved_changes_internal = None
+
+        # Reports if sim was stopped due to detecting stability early
+        self.optimize_repeats = True
+        self.result_optimized_repeats = None
 
     def scale_activation(self, duration, capNeed):
         for res in self.scale_resolutions:
             mod = duration % res
             if mod:
-                if mod > res/2.0:
-                    mod = res-mod
+                if mod > res / 2.0:
+                    mod = res - mod
                 else:
                     mod = -mod
 
-                if abs(mod) <= duration/100.0:
+                if abs(mod) <= duration / 100.0:
                     # only adjust if the adjustment is less than 1%
                     duration += mod
-                    capNeed += float(mod)/duration * capNeed
+                    capNeed += float(mod) / duration * capNeed
                     break
 
         return duration, capNeed
 
     def init(self, modules):
-        """prepare modules. a list of (duration, capNeed, clipSize) tuples is
+        """prepare modules. a list of (duration, capNeed, clipSize, disableStagger, reloadTime, isInjector) tuples is
          expected, with clipSize 0 if the module has infinite ammo.
             """
-        mods = {}
-        for module in modules:
-                if module in mods:
-                        mods[module] += 1
-                else:
-                        mods[module] = 1
-
-        self.modules = mods
-
+        self.modules = modules
 
     def reset(self):
         """Reset the simulator state"""
         self.state = []
+        self.saved_changes_internal = {}
+        self.result_optimized_repeats = False
+        mods = {}
         period = 1
         disable_period = False
 
-        for (duration, capNeed, clipSize), amount in self.modules.iteritems():
+        # Loop over modules, clearing clipSize if applicable, and group modules based on attributes
+        for (duration, capNeed, clipSize, disableStagger, reloadTime, isInjector) in self.modules:
             if self.scale:
                 duration, capNeed = self.scale_activation(duration, capNeed)
 
-            if self.stagger:
-                duration = int(duration/amount)
+            # set clipSize to infinite if reloads are disabled unless it's
+            # a cap booster module
+            if not self.reload and not isInjector:
+                clipSize = 0
+                reloadTime = 0
+
+            # Group modules based on their properties
+            key = (duration, capNeed, clipSize, disableStagger, reloadTime, isInjector)
+            if key in mods:
+                mods[key] += 1
+            else:
+                mods[key] = 1
+
+        # Loop over grouped modules, configure staggering and push to the simulation state
+        for (duration, capNeed, clipSize, disableStagger, reloadTime, isInjector), amount in mods.items():
+            # period optimization doesn't work when reloads are active.
+            if clipSize:
+                disable_period = True
+            # Just push multiple instances if item is injector. We do not want to stagger them as we will
+            # use them as needed and want them to be available right away
+            if isInjector:
+                for i in range(amount):
+                    heapq.heappush(self.state, [0, duration, capNeed, 0, clipSize, reloadTime, isInjector])
+                continue
+            if self.stagger and not disableStagger:
+                # Stagger all mods if they do not need to be reloaded
+                if clipSize == 0:
+                    duration = int(duration / amount)
+                # Stagger mods after first
+                else:
+                    stagger_amount = (duration * clipSize + reloadTime) / (amount * clipSize)
+                    for i in range(1, amount):
+                        heapq.heappush(self.state, [i * stagger_amount, duration, capNeed, 0, clipSize, reloadTime, isInjector])
+            # If mods are not staggered - just multiply cap use
             else:
                 capNeed *= amount
 
             period = lcm(period, duration)
 
-            # set clipSize to infinite if reloads are disabled unless it's
-            # a cap booster module.
-            if not self.reload and capNeed > 0:
-                clipSize = 0
-
-            # period optimization doesn't work when reloads are active.
-            if clipSize:
-                disable_period = True
-
-            heapq.heappush(self.state, [0, duration, capNeed, 0, clipSize])
-
+            heapq.heappush(self.state, [0, duration, capNeed, 0, clipSize, reloadTime, isInjector])
 
         if disable_period:
             self.period = self.t_max
         else:
             self.period = period
 
-
     def run(self):
         """Run the simulation"""
 
         start = time.time()
-
+        awaitingInjectors = []
+        awaitingInjectorsCounterWrap = Counter()
         self.reset()
 
         push = heapq.heappush
@@ -121,27 +148,36 @@ class CapSimulator(object):
         stability_precision = self.stability_precision
         period = self.period
 
+        activation = None
         iterations = 0
 
         capCapacity = self.capacitorCapacity
         tau = self.capacitorRecharge / 5.0
 
-        cap_wrap = capCapacity                # cap value at last period
-        cap_lowest = capCapacity            # lowest cap value encountered
-        cap_lowest_pre = capCapacity    # lowest cap value before activations
-        cap = capCapacity                         # current cap value
-        t_wrap = self.period                    # point in time of next period
-
-        t_now = t_last = 0
+        cap_wrap = self.startingCapacity  # cap value at last period
+        cap_lowest = self.startingCapacity  # lowest cap value encountered
+        cap_lowest_pre = self.startingCapacity  # lowest cap value before activations
+        cap = self.startingCapacity  # current cap value
+        t_wrap = self.period  # point in time of next period
+        t_last = 0
         t_max = self.t_max
 
         while 1:
-            activation = pop(state)
-            t_now, duration, capNeed, shot, clipSize = activation
+            # Nothing to pop - might happen when no mods are activated, or when
+            # only cap injectors are active (and are postponed by code below)
+            try:
+                activation = pop(state)
+            except IndexError:
+                break
+            t_now, duration, capNeed, shot, clipSize, reloadTime, isInjector = activation
+
+            # Max time reached, stop simulation - we're stable
             if t_now >= t_max:
                 break
 
-            cap = ((1.0+(sqrt(cap/capCapacity)-1.0)*exp((t_last-t_now)/tau))**2)*capCapacity
+            # Regenerate cap from last time point
+            if t_now > t_last:
+                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:
@@ -149,36 +185,104 @@ class CapSimulator(object):
                 if t_now == t_wrap:
                     # history is repeating itself, so if we have more cap now than last
                     # time this happened, it is a stable setup.
-                    if cap >= cap_wrap:
+                    awaitingInjectorsCounterNow = Counter(awaitingInjectors)
+                    if self.optimize_repeats and cap >= cap_wrap and awaitingInjectorsCounterNow == awaitingInjectorsCounterWrap:
+                        self.result_optimized_repeats = True
                         break
                     cap_wrap = round(cap, stability_precision)
+                    awaitingInjectorsCounterWrap = awaitingInjectorsCounterNow
                     t_wrap += period
 
-            cap -= capNeed
-            if cap > capCapacity:
-                cap = capCapacity
-
+            t_last = t_now
             iterations += 1
 
-            if cap < cap_lowest:
-                if cap < 0.0:
-                    break
-                cap_lowest = cap
+            # If injecting cap will "overshoot" max cap, postpone it
+            if isInjector and cap - capNeed > capCapacity:
+                awaitingInjectors.append((duration, capNeed, shot, clipSize, reloadTime, isInjector))
 
-            t_last = t_now
+            else:
+                # If we will need more cap than we have, but we are not at 100% -
+                # use awaiting cap injectors to top us up until we have enough or
+                # until we're full
+                if capNeed > cap and cap < capCapacity:
+                    while awaitingInjectors and capNeed > cap and capCapacity > cap:
+                        neededInjection = min(capNeed - cap, capCapacity - cap)
+                        # Find injectors which have just enough cap or more
+                        goodInjectors = [i for i in awaitingInjectors if -i[1] >= neededInjection]
+                        if goodInjectors:
+                            # Pick injector which overshoots the least
+                            bestInjector = min(goodInjectors, key=lambda i: -i[1])
+                        else:
+                            # Take the one which provides the most cap
+                            bestInjector = max(goodInjectors, key=lambda i: -i[1])
+                        # Use injector
+                        awaitingInjectors.remove(bestInjector)
+                        inj_duration, inj_capNeed, inj_shot, inj_clipSize, inj_reloadTime, inj_isInjector = bestInjector
+                        cap -= inj_capNeed
+                        if cap > capCapacity:
+                            cap = capCapacity
+                        self.saved_changes_internal[t_now] = cap
+                        # Add injector to regular state tracker
+                        inj_t_now = t_now
+                        inj_t_now += inj_duration
+                        inj_shot += 1
+                        if inj_clipSize:
+                            if inj_shot % inj_clipSize == 0:
+                                inj_shot = 0
+                                inj_t_now += inj_reloadTime
+                        push(state, [inj_t_now, inj_duration, inj_capNeed, inj_shot, inj_clipSize, inj_reloadTime, inj_isInjector])
 
-            # queue the next activation of this module
-            t_now += duration
-            shot += 1
-            if clipSize:
-                if shot % clipSize == 0:
-                    shot = 0
-                    t_now += 10000    # include reload time
-            activation[0] = t_now
-            activation[3] = shot
+                # Apply cap modification
+                cap -= capNeed
+                if cap > capCapacity:
+                    cap = capCapacity
+                self.saved_changes_internal[t_now] = cap
 
+                if cap < cap_lowest:
+                    # Negative cap - we're unstable, simulation is over
+                    if cap < 0.0:
+                        break
+                    cap_lowest = cap
+
+                # Try using awaiting injectors to top up the cap after spending some
+                while awaitingInjectors and cap < capCapacity:
+                    neededInjection = capCapacity - cap
+                    # Find injectors which do not overshoot max cap
+                    goodInjectors = [i for i in awaitingInjectors if -i[1] <= neededInjection]
+                    if not goodInjectors:
+                        break
+                    # Take the one which provides the most cap
+                    bestInjector = max(goodInjectors, key=lambda i: -i[1])
+                    # Use injector
+                    awaitingInjectors.remove(bestInjector)
+                    inj_duration, inj_capNeed, inj_shot, inj_clipSize, inj_reloadTime, inj_isInjector = bestInjector
+                    cap -= inj_capNeed
+                    if cap > capCapacity:
+                        cap = capCapacity
+                    self.saved_changes_internal[t_now] = cap
+                    # Add injector to regular state tracker
+                    inj_t_now = t_now
+                    inj_t_now += inj_duration
+                    inj_shot += 1
+                    if inj_clipSize:
+                        if inj_shot % inj_clipSize == 0:
+                            inj_shot = 0
+                            inj_t_now += inj_reloadTime
+                    push(state, [inj_t_now, inj_duration, inj_capNeed, inj_shot, inj_clipSize, inj_reloadTime, inj_isInjector])
+
+                # queue the next activation of this module
+                t_now += duration
+                shot += 1
+                if clipSize:
+                    if shot % clipSize == 0:
+                        shot = 0
+                        t_now += reloadTime  # include reload time
+                activation[0] = t_now
+                activation[3] = shot
+
+                push(state, activation)
+        if activation is not None:
             push(state, activation)
-        push(state, activation)
 
         # update instance with relevant results.
         self.t = t_last
@@ -186,19 +290,19 @@ class CapSimulator(object):
 
         # calculate EVE's stability value
         try:
-            avgDrain = reduce(float.__add__, map(lambda x: x[2]/x[1], self.state), 0.0)
-            self.cap_stable_eve = 0.25 * (1.0 + sqrt(-(2.0 * avgDrain * tau - capCapacity)/capCapacity)) ** 2
+            avgDrain = sum(x[2] / x[1] for x in self.state)
+            self.cap_stable_eve = 0.25 * (1.0 + sqrt(-(2.0 * avgDrain * tau - capCapacity) / capCapacity)) ** 2
         except ValueError:
             self.cap_stable_eve = 0.0
 
-
         if cap > 0.0:
             # capacitor low/high water marks
             self.cap_stable_low = cap_lowest
             self.cap_stable_high = cap_lowest_pre
         else:
-            self.cap_stable_low =\
-            self.cap_stable_high = 0.0
+            self.cap_stable_low = self.cap_stable_high = 0.0
 
+        self.saved_changes = tuple((k / 1000, max(0, self.saved_changes_internal[k])) for k in sorted(self.saved_changes_internal))
+        self.saved_changes_internal = None
 
-        self.runtime = time.time()-start
+        self.runtime = time.time() - start

eos/config.py

@@ -1,11 +1,51 @@
-import os.path
 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:///' + os.path.expanduser(os.path.join("~", ".pyfa","eve.db"))
-saveddata_connectionstring = 'sqlite:///:memory:'
+gamedata_version = ""
+gamedata_date = ""
+gamedata_connectionstring = 'sqlite:///' + realpath(join(dirname(abspath(__file__)), "..", "eve.db"))
 
-#Autodetect path, only change if the autodetection bugs out.
-path = os.path.dirname(unicode(__file__, sys.getfilesystemencoding()))
+lang = ""
+
+# Maps supported langauges to their suffix in the database
+translation_mapping = {
+    "en": "",
+    "fr": "_fr",
+    # "it": "_it",
+    "ja": "_ja",
+    "ko": "_ko",
+    "ru": "_ru",
+    "zh": "_zh",
+}
+
+def set_lang(i18n_lang):
+    global lang
+    lang = translation_mapping.get(i18n_lang, translation_mapping.get("en"))
+
+pyfalog.debug("Gamedata connection string: {0}", gamedata_connectionstring)
+
+if istravis is True or hasattr(sys, '_called_from_test'):
+    # Running in Travis. Run saveddata database in memory.
+    saveddata_connectionstring = 'sqlite:///:memory:'
+else:
+    saveddata_connectionstring = 'sqlite:///' + realpath(join(dirname(abspath(__file__)), "..", "saveddata", "saveddata.db"))
+
+pyfalog.debug("Saveddata connection string: {0}", saveddata_connectionstring)
+
+settings = {
+    "useStaticAdaptiveArmorHardener": False,
+    "strictSkillLevels": True,
+    "globalDefaultSpoolupPercentage": 1.0
+}
+
+# Autodetect path, only change if the autodetection bugs out.
+path = dirname(__file__)

eos/const.py

@@ -0,0 +1,115 @@
+# =============================================================================
+# Copyright (C) 2019 Ryan Holmes
+#
+# 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 enum import IntEnum,unique
+
+
+@unique
+class FittingSlot(IntEnum):
+    """
+    Contains slots for ship fittings
+    """
+    # These are self-explanatory
+    LOW = 1
+    MED = 2
+    HIGH = 3
+    RIG = 4
+    SUBSYSTEM = 5
+    # not a real slot, need for pyfa display rack separation
+    MODE = 6
+    # system effects. They are projected "modules" and pyfa assumes all modules
+    # have a slot. In this case, make one up.
+    SYSTEM = 7
+    # used for citadel services
+    SERVICE = 8
+    # fighter 'slots'. Just easier to put them here...
+    F_LIGHT = 10
+    F_SUPPORT = 11
+    F_HEAVY = 12
+    # fighter 'slots' (for structures)
+    FS_LIGHT = 13
+    FS_SUPPORT = 14
+    FS_HEAVY = 15
+
+
+@unique
+class ImplantLocation(IntEnum):
+    """
+    Contains location of the implant
+    """
+    FIT = 0
+    CHARACTER = 1
+
+
+@unique
+class CalcType(IntEnum):
+    """
+    Contains location of the calculation
+    """
+    LOCAL = 0
+    PROJECTED = 1
+    COMMAND = 2
+
+
+@unique
+class FittingModuleState(IntEnum):
+    """
+    Contains the state of a fitting module
+    """
+    OFFLINE = -1
+    ONLINE = 0
+    ACTIVE = 1
+    OVERHEATED = 2
+
+
+@unique
+class FittingHardpoint(IntEnum):
+    """
+    Contains the types of a fitting hardpoint
+    """
+    NONE = 0
+    MISSILE = 1
+    TURRET = 2
+
+
+@unique
+class SpoolType(IntEnum):
+    # Spool and cycle scale are different in case if max spool amount cannot
+    # be divided by spool step without remainder
+    SPOOL_SCALE = 0  # [0..1]
+    CYCLE_SCALE = 1  # [0..1]
+    TIME = 2  # Expressed via time in seconds since spool up started
+    CYCLES = 3  # Expressed in amount of cycles since spool up started
+
+
+@unique
+class FitSystemSecurity(IntEnum):
+    HISEC = 0
+    LOWSEC = 1
+    NULLSEC = 2
+    WSPACE = 3
+
+
+@unique
+class Operator(IntEnum):
+    PREASSIGN = 0
+    PREINCREASE = 1
+    MULTIPLY = 2
+    POSTINCREASE = 3
+    FORCE = 4

eos/db/__init__.py

@@ -1,4 +1,4 @@
-#===============================================================================
+# ===============================================================================
 # Copyright (C) 2010 Diego Duclos
 #
 # This file is part of eos.
@@ -15,31 +15,86 @@
 #
 # 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 re
 import threading
 
-from sqlalchemy import MetaData, create_engine
+from sqlalchemy import MetaData, create_engine, event
 from sqlalchemy.orm import sessionmaker, scoped_session
-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
 
+
+def re_fn(expr, item):
+    try:
+        reg = re.compile(expr, re.IGNORECASE)
+    except (SystemExit, KeyboardInterrupt):
+        raise
+    except:
+        return False
+    return reg.search(item) is not None
+
+
+pyfalog.debug('Initializing gamedata')
 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)
+
+
+@event.listens_for(gamedata_engine, 'connect')
+def create_functions(dbapi_connection, connection_record):
+    dbapi_connection.create_function('regexp', 2, re_fn)
+
 
 gamedata_meta = MetaData()
 gamedata_meta.bind = gamedata_engine
-gamedata_session = sessionmaker(bind=gamedata_engine, autoflush=False, expire_on_commit=False)()
+GamedataSession = scoped_session(sessionmaker(bind=gamedata_engine, autoflush=False, expire_on_commit=False))
+gamedata_session = GamedataSession()
 
+gamedata_sessions = {threading.get_ident(): gamedata_session}
+
+
+def get_gamedata_session():
+    thread_id = threading.get_ident()
+    if thread_id not in gamedata_sessions:
+        gamedata_sessions[thread_id] = GamedataSession()
+    return gamedata_sessions[thread_id]
+
+
+pyfalog.debug('Getting gamedata version')
+# 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:
+    config.gamedata_version = gamedata_session.execute(
+            "SELECT `field_value` FROM `metadata` WHERE `field_name` LIKE 'client_build'"
+    ).fetchone()[0]
+    config.gamedata_date = gamedata_session.execute(
+        "SELECT `field_value` FROM `metadata` WHERE `field_name` LIKE 'dump_time'"
+    ).fetchone()[0]
+except (KeyboardInterrupt, SystemExit):
+    raise
+except Exception as e:
+    pyfalog.warning("Missing gamedata version.")
+    pyfalog.critical(e)
+    config.gamedata_version = None
+    config.gamedata_date = None
+
+pyfalog.debug('Initializing saveddata')
 saveddata_connectionstring = config.saveddata_connectionstring
 if saveddata_connectionstring is not None:
     if callable(saveddata_connectionstring):
@@ -50,27 +105,35 @@ 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
-from eos.db.gamedata import *
-from eos.db.saveddata import *
+pyfalog.debug('Importing gamedata DB scheme')
+# Import all the definitions for all our database stuff
+# noinspection PyPep8
+from eos.db.gamedata import alphaClones, attribute, category, effect, group, item, marketGroup, metaData, metaGroup, queries, traits, unit, dynamicAttributes, implantSet
+pyfalog.debug('Importing saveddata DB scheme')
+# noinspection PyPep8
+from eos.db.saveddata import booster, cargo, character, damagePattern, databaseRepair, drone, fighter, fit, implant, implantSet, \
+    miscData, mutator, module, override, price, queries, skill, targetProfile, user
 
-#Import queries
-from eos.db.gamedata.queries import getItem, searchItems, getVariations, getItemsByCategory, directAttributeRequest, \
-                                    getMarketGroup, getGroup, getCategory, getAttributeInfo, getMetaData, getMetaGroup
-from eos.db.saveddata.queries import getUser, getCharacter, getFit, getFitsWithShip, countFitsWithShip, searchFits, \
-                                     getCharacterList, getPrice, getDamagePatternList, getDamagePattern, \
-                                     getFitList, getFleetList, getFleet, save, remove, commit, add, \
-                                     getCharactersForUser, getMiscData, getSquadsIDsWithFitID, getWing, \
-                                     getSquad, getBoosterFits, getProjectedFits, getTargetResistsList, getTargetResists
+pyfalog.debug('Importing gamedata queries')
+# noinspection PyPep8
+from eos.db.gamedata.queries import *
+pyfalog.debug('Importing saveddata queries')
+# 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"]
+__all__ = ["attribute", "category", "effect", "group", "metaData", "dynamicAttributes",
+           "item", "marketGroup", "metaGroup", "unit", "alphaClones", "implantSet"]

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,44 +15,50 @@
 #
 # 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
+import eos.config
 typeattributes_table = Table("dgmtypeattribs", gamedata_meta,
-                         Column("value", Float),
-                         Column("typeID", Integer, ForeignKey("invtypes.typeID"), primary_key=True, index=True),
-                         Column("attributeID", ForeignKey("dgmattribs.attributeID"), primary_key=True))
+                             Column("value", Float),
+                             Column("typeID", Integer, ForeignKey("invtypes.typeID"), primary_key=True, index=True),
+                             Column("attributeID", ForeignKey("dgmattribs.attributeID"), primary_key=True))
 
 attributes_table = Table("dgmattribs", gamedata_meta,
-                         Column("attributeID", Integer, primary_key = True),
+                         Column("attributeID", Integer, primary_key=True),
                          Column("attributeName", String),
                          Column("defaultValue", Float),
+                         Column("maxAttributeID", Integer, ForeignKey("dgmattribs.attributeID")),
                          Column("description", Unicode),
                          Column("published", Boolean),
-                         Column("displayName", String),
+                         *[Column("displayName{}".format(lang), String) for lang in eos.config.translation_mapping.values()],
                          Column("highIsGood", Boolean),
-                         Column("iconID", Integer, ForeignKey("icons.iconID")),
+                         Column("iconID", Integer),
+                         Column("attributeCategory", Integer),
+                         # Column("tooltipDescription", Integer), # deprecated...?
                          Column("unitID", Integer, ForeignKey("dgmunits.unitID")))
 
 mapper(Attribute, typeattributes_table,
-       properties = {"info": relation(AttributeInfo, lazy=False)})
+       properties={"info": relation(AttributeInfo, lazy=False)})
 
 mapper(AttributeInfo, attributes_table,
-       properties = {"icon" : relation(Icon),
-                     "unit": relation(Unit),
-                     "ID": synonym("attributeID"),
-                     "name": synonym("attributeName"),
-                     "description" : deferred(attributes_table.c.description)})
+       properties={
+           "unit"       : relation(Unit),
+           "ID"         : synonym("attributeID"),
+           "name"       : synonym("attributeName"),
+           "description": deferred(attributes_table.c.description),
+       })
 
 Attribute.ID = association_proxy("info", "attributeID")
 Attribute.name = association_proxy("info", "attributeName")
 Attribute.description = association_proxy("info", "description")
 Attribute.published = association_proxy("info", "published")
-Attribute.displayName = association_proxy("info", "displayName")
+Attribute.displayName = association_proxy("info", "displayName{}".format(eos.config.lang))
 Attribute.highIsGood = association_proxy("info", "highIsGood")
 Attribute.iconID = association_proxy("info", "iconID")
 Attribute.icon = association_proxy("info", "icon")

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 sqlalchemy import Boolean, Column, Integer, String, Table
+from sqlalchemy.orm import deferred, mapper, synonym
 
 from eos.db import gamedata_meta
-from eos.types import Category, Icon
+from eos.gamedata import Category
+import eos.config
 
 categories_table = Table("invcategories", gamedata_meta,
-                         Column("categoryID", Integer, primary_key = True),
-                         Column("categoryName", String),
-                         Column("description", String),
+                         Column("categoryID", Integer, primary_key=True),
+                         *[Column("name{}".format(lang), String) for lang in eos.config.translation_mapping.values()],
+                         # Column("description", String), # deprecated
                          Column("published", Boolean),
-                         Column("iconID", Integer, ForeignKey("icons.iconID")))
+                         Column("iconID", Integer))
 
 mapper(Category, categories_table,
-       properties = {"icon" : relation(Icon),
-                     "ID" : synonym("categoryID"),
-                     "name" : synonym("categoryName"),
-                     "description" : deferred(categories_table.c.description)})
+       properties={
+           "ID"         : synonym("categoryID"),
+           "displayName": synonym("name{}".format(eos.config.lang)),
+           # "description": deferred(categories_table.c.description) # deprecated
+       })

eos/db/gamedata/dynamicAttributes.py

@@ -0,0 +1,65 @@
+# ===============================================================================
+# 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, Float, Integer, Table, ForeignKey
+from sqlalchemy.orm import mapper, relation, synonym
+from sqlalchemy.ext.associationproxy import association_proxy
+
+from eos.db import gamedata_meta
+from eos.gamedata import DynamicItem, DynamicItemAttribute, DynamicItemItem, Item
+
+from eos.gamedata import AttributeInfo
+
+dynamic_table = Table("mutaplasmids", gamedata_meta,
+                          Column("typeID", ForeignKey("invtypes.typeID"), primary_key=True, index=True),
+                          Column("resultingTypeID", ForeignKey("invtypes.typeID"), primary_key=True))
+
+dynamicAttributes_table = Table("mutaplasmidAttributes", gamedata_meta,
+                      Column("typeID", Integer, ForeignKey("mutaplasmids.typeID"), primary_key=True),
+                      Column("attributeID", ForeignKey("dgmattribs.attributeID"), primary_key=True),
+                      Column("min", Float),
+                      Column("max", Float))
+
+dynamicApplicable_table = Table("mutaplasmidItems", gamedata_meta,
+                      Column("typeID", ForeignKey("mutaplasmids.typeID"), primary_key=True),
+                      Column("applicableTypeID", ForeignKey("invtypes.typeID"), primary_key=True),)
+
+mapper(DynamicItem, dynamic_table, properties={
+           "attributes": relation(DynamicItemAttribute),
+           "item": relation(Item, foreign_keys=[dynamic_table.c.typeID]),
+           "resultingItem": relation(Item, foreign_keys=[dynamic_table.c.resultingTypeID]),
+           "ID": synonym("typeID"),
+})
+
+mapper(DynamicItemAttribute, dynamicAttributes_table,
+       properties={"info": relation(AttributeInfo, lazy=False)})
+
+mapper(DynamicItemItem, dynamicApplicable_table, properties={
+           "mutaplasmid": relation(DynamicItem),
+       })
+
+DynamicItemAttribute.ID = association_proxy("info", "attributeID")
+DynamicItemAttribute.name = association_proxy("info", "attributeName")
+DynamicItemAttribute.description = association_proxy("info", "description")
+DynamicItemAttribute.published = association_proxy("info", "published")
+DynamicItemAttribute.displayName = association_proxy("info", "displayName")
+DynamicItemAttribute.highIsGood = association_proxy("info", "highIsGood")
+DynamicItemAttribute.iconID = association_proxy("info", "iconID")
+DynamicItemAttribute.icon = association_proxy("info", "icon")
+DynamicItemAttribute.unit = association_proxy("info", "unit")

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, relation, deferred
-from eos.types import Effect, EffectInfo
+from sqlalchemy.orm import mapper, synonym, deferred
+
 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,
-       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")
+mapper(ItemEffect, typeeffects_table)

eos/db/gamedata/group.py

@@ -1,4 +1,4 @@
-#===============================================================================
+# ===============================================================================
 # Copyright (C) 2010 Diego Duclos
 #
 # This file is part of eos.
@@ -15,25 +15,27 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with eos.  If not, see <http://www.gnu.org/licenses/>.
-#===============================================================================
+# ===============================================================================
 
 from sqlalchemy import Column, String, Integer, Boolean, ForeignKey, Table
-from sqlalchemy.orm import relation, mapper, synonym, deferred
+from sqlalchemy.orm import relation, mapper, synonym, deferred, backref
 
 from eos.db import gamedata_meta
-from eos.types import Group, Icon, Category
+from eos.gamedata import Category, Group
+import eos.config
 
 groups_table = Table("invgroups", gamedata_meta,
-                     Column("groupID", Integer, primary_key = True),
-                     Column("groupName", String),
-                     Column("description", String),
+                     Column("groupID", Integer, primary_key=True),
+                     *[Column("name{}".format(lang), String) for lang in eos.config.translation_mapping.values()],
+                     # Column("description", String), # deprecated
                      Column("published", Boolean),
                      Column("categoryID", Integer, ForeignKey("invcategories.categoryID")),
-                     Column("iconID", Integer, ForeignKey("icons.iconID")))
+                     Column("iconID", Integer))
 
 mapper(Group, groups_table,
-       properties = {"category" : relation(Category, backref = "groups"),
-                     "icon" : relation(Icon),
-                     "ID" : synonym("groupID"),
-                     "name" : synonym("groupName"),
-                     "description" : deferred(groups_table.c.description)})
+       properties={
+           "category"   : relation(Category, backref=backref("groups", cascade="all,delete")),
+           "ID"         : synonym("groupID"),
+           "displayName"       : synonym("name{}".format(eos.config.lang)),
+           # "description": deferred(groups_table.c.description) # deprecated
+       })

eos/db/gamedata/icon.py

@@ -1,33 +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 Column, String, Integer, Table
-from sqlalchemy.orm import mapper, synonym, deferred
-
-from eos.db import gamedata_meta
-from eos.types import Icon
-
-icons_table = Table("icons", gamedata_meta,
-                    Column("iconID", Integer, primary_key = True),
-                    Column("description", String),
-                    Column("iconFile", String))
-
-mapper(Icon, icons_table,
-       properties = {"ID" : synonym("iconID"),
-                     "description" : deferred(icons_table.c.description)})

eos/db/gamedata/implantSet.py

@@ -0,0 +1,33 @@
+# ===============================================================================
+# 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
+from sqlalchemy.orm import mapper, synonym
+
+from eos.db import gamedata_meta
+from eos.gamedata import ImplantSet
+
+implant_set_table = Table("implantsets", gamedata_meta,
+                          Column("setID", Integer, primary_key=True),
+                          Column("setName", String),
+                          Column("gradeName", String),
+                          Column("implants", String))
+
+mapper(ImplantSet, implant_set_table,
+       properties={"ID": synonym("setID")})

eos/db/gamedata/item.py

@@ -1,4 +1,4 @@
-#===============================================================================
+# ===============================================================================
 # Copyright (C) 2010 Diego Duclos
 #
 # This file is part of eos.
@@ -15,46 +15,68 @@
 #
 # 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 import Boolean, Column, Float, ForeignKey, Integer, String, Table
 from sqlalchemy.ext.associationproxy import association_proxy
+from sqlalchemy.orm import backref, deferred, mapper, relation, synonym
 from sqlalchemy.orm.collections import attribute_mapped_collection
 
 from eos.db import gamedata_meta
-from eos.types import Icon, Attribute, Item, Effect, MetaType, Group, Traits
+from eos.db.gamedata.dynamicAttributes import dynamicApplicable_table
+from eos.db.gamedata.effect import typeeffects_table
+from eos.gamedata import Attribute, DynamicItem, Effect, Group, Item, Traits, MetaGroup
+
+import eos.config
 
 items_table = Table("invtypes", gamedata_meta,
-                    Column("typeID", Integer, primary_key = True),
-                    Column("typeName", String, index=True),
-                    Column("description", String),
+                    Column("typeID", Integer, primary_key=True),
+                    *[Column("typeName{}".format(lang), String, index=True) for lang in eos.config.translation_mapping.values()],
+                    *[Column("typeDescription{}".format(lang), String) for lang in eos.config.translation_mapping.values()],
                     Column("raceID", Integer),
-                    Column("volume", Float),
-                    Column("mass", Float),
-                    Column("capacity", Float),
+                    Column("factionID", Integer),
                     Column("published", Boolean),
                     Column("marketGroupID", Integer, ForeignKey("invmarketgroups.marketGroupID")),
-                    Column("iconID", Integer, ForeignKey("icons.iconID")),
-                    Column("groupID", Integer, ForeignKey("invgroups.groupID"), index=True))
+                    Column("iconID", Integer),
+                    Column("graphicID", Integer),
+                    Column("groupID", Integer, ForeignKey("invgroups.groupID"), index=True),
+                    Column("metaLevel", Integer),
+                    Column("metaGroupID", Integer, ForeignKey("invmetagroups.metaGroupID"), index=True),
+                    Column("variationParentTypeID", Integer, ForeignKey("invtypes.typeID"), index=True),
+                    Column("replacements", String),
+                    Column("reqskills", String),
+                    Column("requiredfor", String),
+                    )
 
-from .metaGroup import metatypes_table
-from .traits import traits_table
+from .traits import traits_table  # noqa
 
-mapper(Item, items_table,
-       properties = {"group" : relation(Group, backref = "items"),
-                     "icon" : relation(Icon),
-                     "_Item__attributes" : relation(Attribute, collection_class = attribute_mapped_collection('name')),
-                     "effects" : relation(Effect, collection_class = attribute_mapped_collection('name')),
-                     "metaGroup" : relation(MetaType,
-                                            primaryjoin = metatypes_table.c.typeID == items_table.c.typeID,
-                                            uselist = False),
-                     "ID" : synonym("typeID"),
-                     "name" : synonym("typeName"),
-                     "description" : deferred(items_table.c.description),
-                     "traits" : relation(Traits,
-                                         primaryjoin = traits_table.c.typeID == items_table.c.typeID,
-                                         uselist = False)
-                    })
+props = {
+           "group": relation(Group, backref=backref("items", cascade="all,delete")),
+           "_Item__attributes": relation(Attribute, cascade='all, delete, delete-orphan', collection_class=attribute_mapped_collection('name')),
+           "effects": relation(Effect, secondary=typeeffects_table, collection_class=attribute_mapped_collection('name')),
+           "metaGroup": relation(MetaGroup, backref=backref("items", cascade="all,delete")),
+           "varParent": relation(Item, backref=backref("varChildren", cascade="all,delete"), remote_side=items_table.c.typeID),
+           "ID": synonym("typeID"),
+           "name": synonym("typeName{}".format(eos.config.lang)),
+           "description" : synonym("_description{}".format(eos.config.lang)),
+           "traits": relation(
+               Traits,
+               primaryjoin=traits_table.c.typeID == items_table.c.typeID,
+               uselist=False
+           ),
+           "mutaplasmids": relation(
+               DynamicItem,
+               primaryjoin=dynamicApplicable_table.c.applicableTypeID == items_table.c.typeID,
+               secondaryjoin=dynamicApplicable_table.c.typeID == DynamicItem.typeID,
+               secondary=dynamicApplicable_table,
+               backref="applicableItems"
+           )
+}
+
+# Create deferred columns shadowing all the description fields. The literal `description` property will dynamically
+# be assigned as synonym to one of these
+props.update({'_description' + v: deferred(items_table.c['typeDescription' + v]) for (k, v) in eos.config.translation_mapping.items()})
+
+mapper(Item, items_table, properties=props)
 
 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,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 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 Item, MarketGroup
+import eos.config
 
 marketgroups_table = Table("invmarketgroups", gamedata_meta,
-                           Column("marketGroupID", Integer, primary_key = True),
-                           Column("marketGroupName", String),
-                           Column("description", String),
+                           Column("marketGroupID", Integer, primary_key=True),
+                           *[Column("marketGroupName{}".format(lang), String) for lang in eos.config.translation_mapping.values()],
+                           *[Column("marketGroupDescription{}".format(lang), String) for lang in eos.config.translation_mapping.values()],
                            Column("hasTypes", Boolean),
-                           Column("parentGroupID", Integer, ForeignKey("invmarketgroups.marketGroupID", initially="DEFERRED", deferrable=True)),
-                           Column("iconID", Integer, ForeignKey("icons.iconID")))
+                           Column("parentGroupID", Integer,
+                                ForeignKey("invmarketgroups.marketGroupID", initially="DEFERRED", deferrable=True)),
+                           Column("iconID", Integer))
+
+props = {
+    "items": relation(Item, backref="marketGroup"),
+    "parent": relation(MarketGroup, backref="children", remote_side=[marketgroups_table.c.marketGroupID]),
+    "ID": synonym("marketGroupID"),
+    "name": synonym("marketGroupName{}".format(eos.config.lang)),
+    "description": synonym("_description{}".format(eos.config.lang)),
+}
+
+# Create deferred columns shadowing all the description fields. The literal `description` property will dynamically
+# be assigned as synonym to one of these
+# this is mostly here to allow the db_update to be language-agnostic
+# todo: determine if we ever use market group descriptions... can we just get with of these?
+props.update({'_description' + v: deferred(marketgroups_table.c['marketGroupDescription' + v]) for (k, v) in eos.config.translation_mapping.items()})
+
+mapper(
+    MarketGroup,
+    marketgroups_table,
+    properties=props
+)
 
-mapper(MarketGroup, marketgroups_table,
-       properties = {"items" : relation(Item, backref = "marketGroup"),
-                     "parent" : relation(MarketGroup, backref = "children", remote_side = [marketgroups_table.c.marketGroupID]),
-                     "icon" : relation(Icon),
-                     "ID" : synonym("marketGroupID"),
-                     "name" : synonym("marketGroupName"),
-                     "description" : deferred(marketgroups_table.c.description)})

eos/db/gamedata/metaData.py

@@ -1,29 +1,30 @@
-#===============================================================================
-# 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, Table, String
-from sqlalchemy.orm import mapper
-from eos.types import MetaData
-from eos.db import gamedata_meta
-
-metadata_table = Table("metadata", gamedata_meta,
-                           Column("fieldName", String, primary_key=True),
-                           Column("fieldValue", String))
-
-mapper(MetaData, metadata_table)
+# ===============================================================================
+# 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, Table, String
+from sqlalchemy.orm import mapper
+
+from eos.db import gamedata_meta
+from eos.gamedata import MetaData
+
+metadata_table = Table("metadata", gamedata_meta,
+                       Column("field_name", String, primary_key=True),
+                       Column("field_value", String))
+
+mapper(MetaData, metadata_table)

eos/db/gamedata/metaGroup.py

@@ -1,4 +1,4 @@
-#===============================================================================
+# ===============================================================================
 # Copyright (C) 2010 Diego Duclos
 #
 # This file is part of eos.
@@ -15,33 +15,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, String
+from sqlalchemy.orm import mapper, synonym
 
-from sqlalchemy import Table, Column, Integer, ForeignKey, String
-from sqlalchemy.orm import relation, mapper, synonym
 from eos.db import gamedata_meta
-from eos.db.gamedata.item import items_table
-from eos.types import MetaGroup, Item, MetaType
-from sqlalchemy.ext.associationproxy import association_proxy
+from eos.gamedata import MetaGroup
+import eos.config
 
-metagroups_table = Table("invmetagroups", gamedata_meta,
-                         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("parentTypeID", Integer, ForeignKey("invtypes.typeID")),
-                        Column("metaGroupID", Integer, ForeignKey("invmetagroups.metaGroupID")))
-
-mapper(MetaGroup, metagroups_table,
-       properties = {"ID" : synonym("metaGroupID"),
-                     "name" : synonym("metaGroupName")})
-
-mapper(MetaType, metatypes_table,
-       properties = {"ID" : synonym("metaGroupID"),
-                     "parent" : relation(Item, primaryjoin = metatypes_table.c.parentTypeID == items_table.c.typeID),
-                     "items" : relation(Item, primaryjoin = metatypes_table.c.typeID == items_table.c.typeID),
-                     "info": relation(MetaGroup, lazy=False)})
-
-MetaType.name = association_proxy("info", "name")
+metagroups_table = Table(
+    "invmetagroups",
+    gamedata_meta,
+    Column("metaGroupID", Integer, primary_key=True),
+    *[Column("metaGroupName{}".format(lang), String) for lang in eos.config.translation_mapping.values()],
+)
 
+mapper(
+    MetaGroup,
+    metagroups_table,
+    properties={
+        "ID"  : synonym("metaGroupID"),
+        "name": synonym("metaGroupName{}".format(eos.config.lang))
+    }
+)

eos/db/gamedata/queries.py

@@ -1,4 +1,4 @@
-#===============================================================================
+# ===============================================================================
 # Copyright (C) 2010 Diego Duclos
 #
 # This file is part of eos.
@@ -15,21 +15,24 @@
 #
 # 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.inspection import inspect
+from sqlalchemy.orm import aliased, exc, join
+from sqlalchemy.sql import and_, or_, select
 
-from eos.db import gamedata_session
-from eos.db.gamedata.metaGroup import metatypes_table, items_table
-from sqlalchemy.sql import and_, or_, select, func
-from sqlalchemy.orm import join, exc
-from eos.types import Item, Category, Group, MarketGroup, AttributeInfo, MetaData, MetaGroup
-from eos.db.util import processEager, processWhere
 import eos.config
+from eos.db import get_gamedata_session
+from eos.db.gamedata.item import items_table
+from eos.db.gamedata.group import groups_table
+from eos.db.util import processEager, processWhere
+from eos.gamedata import AlphaClone, Attribute, AttributeInfo, Category, DynamicItem, Group, Item, MarketGroup, MetaData, MetaGroup, ImplantSet
 
+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 +48,7 @@ if configVal is True:
                 return handler
 
             return checkAndReturn
+
         return deco
 
 elif callable(configVal):
@@ -56,133 +60,262 @@ else:
                 return function(*args, **kwargs)
 
             return checkAndReturn
+
         return deco
 
-def sqlizeString(line):
+
+def sqlizeNormalString(line):
     # Escape backslashes first, as they will be as escape symbol in queries
     # Then escape percent and underscore signs
     # Finally, replace generic wildcards with sql-style wildcards
     line = line.replace("\\", "\\\\").replace("%", "\\%").replace("_", "\\_").replace("*", "%")
     return line
 
+
 itemNameMap = {}
+
+
 @cachedQuery(1, "lookfor")
 def getItem(lookfor, eager=None):
     if isinstance(lookfor, int):
         if eager is None:
-            item = gamedata_session.query(Item).get(lookfor)
+            item = get_gamedata_session().query(Item).get(lookfor)
         else:
-            item = gamedata_session.query(Item).options(*processEager(eager)).filter(Item.ID == lookfor).first()
-    elif isinstance(lookfor, basestring):
+            item = get_gamedata_session().query(Item).options(*processEager(eager)).filter(Item.ID == lookfor).first()
+    elif isinstance(lookfor, str):
         if lookfor in itemNameMap:
             id = itemNameMap[lookfor]
             if eager is None:
-                item = gamedata_session.query(Item).get(id)
+                item = get_gamedata_session().query(Item).get(id)
             else:
-                item = gamedata_session.query(Item).options(*processEager(eager)).filter(Item.ID == id).first()
+                item = get_gamedata_session().query(Item).options(*processEager(eager)).filter(Item.ID == id).first()
         else:
             # Item names are unique, so we can use first() instead of one()
-            item = gamedata_session.query(Item).options(*processEager(eager)).filter(Item.name == lookfor).first()
-            itemNameMap[lookfor] = item.ID
+            item = get_gamedata_session().query(Item).options(*processEager(eager)).filter(Item.typeName == lookfor).first()
+            if item is not None:
+                itemNameMap[lookfor] = item.ID
     else:
         raise TypeError("Need integer or string as argument")
     return item
 
+@cachedQuery(1, "itemIDs")
+def getItems(itemIDs, eager=None):
+    if not isinstance(itemIDs, (tuple, list, set)) or not all(isinstance(t, int) for t in itemIDs):
+        raise TypeError("Need iterable of integers as argument")
+    if eager is None:
+        items = get_gamedata_session().query(Item).filter(Item.ID.in_(itemIDs)).all()
+    else:
+        items = get_gamedata_session().query(Item).options(*processEager(eager)).filter(Item.ID.in_(itemIDs)).all()
+    return items
+
+
+def getMutaplasmid(lookfor, eager=None):
+    if isinstance(lookfor, int):
+        item = get_gamedata_session().query(DynamicItem).filter(DynamicItem.ID == lookfor).first()
+    else:
+        raise TypeError("Need integer as argument")
+    return item
+
+
+def getItemWithBaseItemAttribute(lookfor, baseItemID, eager=None):
+    # A lot of this is described in more detail in #1597
+    item = get_gamedata_session().query(Item).get(lookfor)
+    base = getItem(baseItemID)
+
+    # we have to load all attributes for this object, otherwise we'll lose access to them when we expunge.
+    # todo: figure out a way to eagerly load all these via the query...
+    for x in [*inspect(Item).relationships.keys(), 'description']:
+        getattr(item, x)
+
+    # Copy over the attributes from the base, but ise the items attributes when there's an overlap
+    # WARNING: the attribute object still has the old typeID. I don't believe we access this typeID anywhere in the code,
+    # but should keep this in mind for now.
+    item._Item__attributes = {**base.attributes, **item.attributes}
+
+    # Expunge the item form the session. This is required to have different Abyssal / Base combinations loaded in memory.
+    # Without expunging it, once one Abyssal Web is created, SQLAlchmey will use it for all others. We don't want this,
+    # we want to generate a completely new object to work with
+    get_gamedata_session().expunge(item)
+    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 = get_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 = get_gamedata_session().query(AlphaClone).get(lookfor)
+        else:
+            item = get_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 = get_gamedata_session().query(AlphaClone).options(*eager).all()
+    return clones
+
+
 groupNameMap = {}
+
+
 @cachedQuery(1, "lookfor")
 def getGroup(lookfor, eager=None):
     if isinstance(lookfor, int):
         if eager is None:
-            group = gamedata_session.query(Group).get(lookfor)
+            group = get_gamedata_session().query(Group).get(lookfor)
         else:
-            group = gamedata_session.query(Group).options(*processEager(eager)).filter(Group.ID == lookfor).first()
-    elif isinstance(lookfor, basestring):
+            group = get_gamedata_session().query(Group).options(*processEager(eager)).filter(Group.ID == lookfor).first()
+    elif isinstance(lookfor, str):
         if lookfor in groupNameMap:
             id = groupNameMap[lookfor]
             if eager is None:
-                group = gamedata_session.query(Group).get(id)
+                group = get_gamedata_session().query(Group).get(id)
             else:
-                group = gamedata_session.query(Group).options(*processEager(eager)).filter(Group.ID == id).first()
+                group = get_gamedata_session().query(Group).options(*processEager(eager)).filter(Group.ID == id).first()
         else:
             # Group names are unique, so we can use first() instead of one()
-            group = gamedata_session.query(Group).options(*processEager(eager)).filter(Group.name == lookfor).first()
-            groupNameMap[lookfor] = group.ID
+            group = get_gamedata_session().query(Group).options(*processEager(eager)).filter(Group.name == lookfor).first()
+            if group is not None:
+                groupNameMap[lookfor] = group.ID
     else:
         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)
+            category = get_gamedata_session().query(Category).get(lookfor)
         else:
-            category = gamedata_session.query(Category).options(*processEager(eager)).filter(Category.ID == lookfor).first()
-    elif isinstance(lookfor, basestring):
+            category = get_gamedata_session().query(Category).options(*processEager(eager)).filter(
+                    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)
+                category = get_gamedata_session().query(Category).get(id)
             else:
-                category = gamedata_session.query(Category).options(*processEager(eager)).filter(Category.ID == id).first()
+                category = get_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()
-            categoryNameMap[lookfor] = category.ID
+            category = get_gamedata_session().query(Category).options(*processEager(eager)).filter(
+                    Category.name == lookfor).first()
+            if category is not None:
+                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)
+            metaGroup = get_gamedata_session().query(MetaGroup).get(lookfor)
         else:
-            metaGroup = gamedata_session.query(MetaGroup).options(*processEager(eager)).filter(MetaGroup.ID == lookfor).first()
-    elif isinstance(lookfor, basestring):
+            metaGroup = get_gamedata_session().query(MetaGroup).options(*processEager(eager)).filter(
+                    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)
+                metaGroup = get_gamedata_session().query(MetaGroup).get(id)
             else:
-                metaGroup = gamedata_session.query(MetaGroup).options(*processEager(eager)).filter(MetaGroup.ID == id).first()
+                metaGroup = get_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()
-            metaGroupNameMap[lookfor] = metaGroup.ID
+            metaGroup = get_gamedata_session().query(MetaGroup).options(*processEager(eager)).filter(
+                    MetaGroup.metaGroupName == lookfor).first()
+            if metaGroup is not None:
+                metaGroupNameMap[lookfor] = metaGroup.ID
     else:
         raise TypeError("Need integer or string as argument")
     return metaGroup
 
+
+def getMetaGroups():
+    return get_gamedata_session().query(MetaGroup).all()
+
+
 @cachedQuery(1, "lookfor")
 def getMarketGroup(lookfor, eager=None):
     if isinstance(lookfor, int):
         if eager is None:
-            marketGroup = gamedata_session.query(MarketGroup).get(lookfor)
+            marketGroup = get_gamedata_session().query(MarketGroup).get(lookfor)
         else:
-            marketGroup = gamedata_session.query(MarketGroup).options(*processEager(eager)).filter(MarketGroup.ID == lookfor).first()
+            marketGroup = get_gamedata_session().query(MarketGroup).options(*processEager(eager)).filter(
+                    MarketGroup.ID == lookfor).first()
     else:
         raise TypeError("Need integer as argument")
     return marketGroup
 
+
+def getMarketTreeNodeIds(rootNodeIds):
+    allIds = set()
+    addedIds = set(rootNodeIds)
+    while addedIds:
+        allIds.update(addedIds)
+        addedIds = {mg.ID for mg in get_gamedata_session().query(MarketGroup).filter(MarketGroup.parentGroupID.in_(addedIds))}
+    return allIds
+
+
 @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 get_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:
@@ -191,15 +324,56 @@ def searchItems(nameLike, where=None, join=None, eager=None):
     if not hasattr(join, "__iter__"):
         join = (join,)
 
-    items = gamedata_session.query(Item).options(*processEager(eager)).join(*join)
+    items = get_gamedata_session().query(Item).options(*processEager(eager)).join(*join)
     for token in nameLike.split(' '):
-        token_safe = u"%{0}%".format(sqlizeString(token))
-        items = items.filter(processWhere(Item.name.like(token_safe, escape="\\"), where))
+        token_safe = "%{0}%".format(sqlizeNormalString(token))
+        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, "tokens", "where", "join")
+def searchItemsRegex(tokens, where=None, join=None, eager=None):
+    if not isinstance(tokens, (tuple, list)) or not all(isinstance(t, str) for t in tokens):
+        raise TypeError("Need tuple or list of strings as argument")
+
+    if join is None:
+        join = tuple()
+
+    if not hasattr(join, "__iter__"):
+        join = (join,)
+
+    items = get_gamedata_session().query(Item).options(*processEager(eager)).join(*join)
+    for token in tokens:
+        if where is not None:
+            items = items.filter(and_(Item.name.op('regexp')(token), where))
+        else:
+            items = items.filter(Item.name.op('regexp')(token))
+    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 = get_gamedata_session().query(Item).options(*processEager(eager)).join(Item.group, Group.category)
+    for token in nameLike.split(' '):
+        token_safe = "%{0}%".format(sqlizeNormalString(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")
@@ -207,34 +381,46 @@ def getVariations(itemids, where=None, eager=None):
     if len(itemids) == 0:
         return []
 
-    itemfilter = or_(*(metatypes_table.c.parentTypeID == itemid for itemid in itemids))
+    itemfilter = or_(*(items_table.c.variationParentTypeID == 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 = get_gamedata_session().query(Item).options(*processEager(eager)).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 = get_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
     else:
         raise TypeError("Need integer or string as argument")
     try:
-        result = gamedata_session.query(AttributeInfo).options(*processEager(eager)).filter(filter).one()
+        result = get_gamedata_session().query(AttributeInfo).options(*processEager(eager)).filter(filter).one()
     except exc.NoResultFound:
         result = None
     return result
 
+
 @cachedQuery(1, "field")
 def getMetaData(field):
-    if isinstance(field, basestring):
-        data = gamedata_session.query(MetaData).get(field)
+    if isinstance(field, str):
+        data = get_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 +430,34 @@ def directAttributeRequest(itemIDs, attrIDs):
         if not isinstance(itemID, int):
             raise TypeError("All itemIDs must be integer")
 
-    q = select((eos.types.Item.typeID, eos.types.Attribute.attributeID, eos.types.Attribute.value),
-                                  and_(eos.types.Attribute.attributeID.in_(attrIDs), eos.types.Item.typeID.in_(itemIDs)),
-                                  from_obj=[join(eos.types.Attribute, eos.types.Item)])
+    q = select((Item.typeID, Attribute.attributeID, Attribute.value),
+               and_(Attribute.attributeID.in_(attrIDs), Item.typeID.in_(itemIDs)),
+               from_obj=[join(Attribute, Item)])
 
-    result = gamedata_session.execute(q).fetchall()
+    result = get_gamedata_session().execute(q).fetchall()
     return result
+
+
+def getAbyssalTypes():
+    return set([r.resultingTypeID for r in get_gamedata_session().query(DynamicItem.resultingTypeID).distinct()])
+
+
+@cachedQuery(1, "itemID")
+def getDynamicItem(itemID, eager=None):
+    try:
+        if isinstance(itemID, int):
+            if eager is None:
+                result = get_gamedata_session().query(DynamicItem).filter(DynamicItem.ID == itemID).one()
+            else:
+                result = get_gamedata_session().query(DynamicItem).options(*processEager(eager)).filter(DynamicItem.ID == itemID).one()
+        else:
+            raise TypeError("Need integer as argument")
+    except exc.NoResultFound:
+        result = None
+    return result
+
+
+@cachedQuery(1, "lookfor")
+def getAllImplantSets():
+    implantSets = get_gamedata_session().query(ImplantSet).all()
+    return implantSets

eos/db/gamedata/traits.py

@@ -1,11 +1,21 @@
-
 from sqlalchemy import Column, Table, Integer, String, ForeignKey
-from sqlalchemy.orm import mapper
-from eos.types import Traits
+from sqlalchemy.orm import mapper, synonym
+
 from eos.db import gamedata_meta
+from eos.gamedata import Traits
+import eos.config
 
-traits_table = Table("invtraits", gamedata_meta,
-                     Column("typeID", Integer, ForeignKey("invtypes.typeID"), primary_key=True),
-                     Column("traitText", String))
+traits_table = Table(
+    "invtraits",
+    gamedata_meta,
+    Column("typeID", Integer, ForeignKey("invtypes.typeID"), primary_key=True),
+    *[Column("traitText{}".format(lang), String) for lang in eos.config.translation_mapping.values()],
+)
 
-mapper(Traits, traits_table);
+mapper(
+    Traits,
+    traits_table,
+    properties={
+        "display": synonym("traitText{}".format(eos.config.lang)),
+    }
+)

eos/db/gamedata/unit.py

@@ -1,4 +1,4 @@
-#===============================================================================
+# ===============================================================================
 # Copyright (C) 2010 Diego Duclos
 #
 # This file is part of eos.
@@ -15,19 +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 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
+import eos.config
 
 groups_table = Table("dgmunits", gamedata_meta,
-                     Column("unitID", Integer, primary_key = True),
+                     Column("unitID", Integer, primary_key=True),
                      Column("unitName", String),
-                     Column("displayName", String))
+                     *[Column("displayName{}".format(lang), String) for lang in eos.config.translation_mapping.values()],
+                     )
 
 mapper(Unit, groups_table,
-       properties = {"ID" : synonym("unitID"),
-                     "name" : synonym("unitName")})
+       properties={
+           "ID"  : synonym("unitID"),
+           "name": synonym("unitName")
+        })

eos/db/migration.py

@@ -1,32 +1,44 @@
-import config
+from logbook import Logger
 import shutil
 import time
 
+import config
+from . import migrations
+
+pyfalog = Logger(__name__)
+
+
 def getVersion(db):
     cursor = db.execute('PRAGMA user_version')
     return cursor.fetchone()[0]
 
-def update(saveddata_engine):
-    currversion = getVersion(saveddata_engine)
 
-    if currversion == config.dbversion:
+def getAppVersion():
+    return migrations.appVersion
+
+
+def update(saveddata_engine):
+    dbVersion = getVersion(saveddata_engine)
+    appVersion = getAppVersion()
+
+    if dbVersion == appVersion:
         return
 
-    if currversion < config.dbversion:
+    if dbVersion < appVersion:
         # Automatically backup database
-        toFile = "%s/saveddata_migration_%d-%d_%s.db"%(
+        toFile = "%s/saveddata_migration_%d-%d_%s.db" % (
             config.savePath,
-            currversion,
-            config.dbversion,
+            dbVersion,
+            appVersion,
             time.strftime("%Y%m%d_%H%M%S"))
 
         shutil.copyfile(config.saveDB, toFile)
 
-        for version in xrange(currversion, config.dbversion):
-            module = __import__('eos.db.migrations.upgrade%d'%(version+1), fromlist=True)
-            upgrade = getattr(module, "upgrade", False)
-            if upgrade:
-                upgrade(saveddata_engine)
+        for version in range(dbVersion, appVersion):
+            func = migrations.updates[version + 1]
+            if func:
+                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 = %d'%config.dbversion)
+        saveddata_engine.execute("PRAGMA user_version = {}".format(appVersion))

eos/db/migrations/__init__.py

@@ -7,3 +7,26 @@ define an upgrade() function with the logic. Please note that there must be as
 many upgrade files as there are database versions (version 5 would include
 upgrade files 1-5)
 """
+
+import re
+
+from eos.utils.pyinst_support import iterNamespace
+
+updates = {}
+appVersion = 0
+
+prefix = __name__ + "."
+
+for modName in iterNamespace(__name__, __path__):
+    # loop through python files, extracting update number and function, and
+    # adding it to a list
+    modname_tail = modName.rsplit('.', 1)[-1]
+    m = re.match("^upgrade(?P<index>\d+)$", modname_tail)
+    if not m:
+        continue
+    index = int(m.group("index"))
+    appVersion = max(appVersion, index)
+    module = __import__(modName, fromlist=True)
+    upgrade = getattr(module, "upgrade", False)
+    if upgrade:
+        updates[index] = upgrade

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,29 +69,31 @@ CONVERSIONS = {
     31936: [  # Navy Micro Auxiliary Power Core
         16543,  # Micro 'Vigor' Core Augmentation
     ],
-    8089: [  # Compact Light Missile Launcher
-       8093,  # Prototype 'Arbalest' Light Missile Launcher
+    8089 : [  # Compact 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
+    # Update fits schema to include target resists attribute
     try:
         saveddata_engine.execute("SELECT targetResistsID FROM fits LIMIT 1")
     except sqlalchemy.exc.DatabaseError:
         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 "cargo" SET "itemID" = ? WHERE "itemID" = ?', (replacement_item, retired_item))
-
+            saveddata_engine.execute('UPDATE "modules" SET "itemID" = ? WHERE "itemID" = ?',
+                                     (replacement_item, retired_item))
+            saveddata_engine.execute('UPDATE "cargo" SET "itemID" = ? WHERE "itemID" = ?',
+                                     (replacement_item, retired_item))

eos/db/migrations/upgrade10.py

@@ -0,0 +1,17 @@
+"""
+Migration 10
+
+- Adds active attribute to projected fits
+"""
+
+import sqlalchemy
+
+
+def upgrade(saveddata_engine):
+    # Update projectedFits schema to include active attribute
+    try:
+        saveddata_engine.execute("SELECT active FROM projectedFits LIMIT 1")
+    except sqlalchemy.exc.DatabaseError:
+        saveddata_engine.execute("ALTER TABLE projectedFits ADD COLUMN active BOOLEAN")
+        saveddata_engine.execute("UPDATE projectedFits SET active = 1")
+        saveddata_engine.execute("UPDATE projectedFits SET amount = 1")

eos/db/migrations/upgrade11.py

@@ -0,0 +1,116 @@
+"""
+Migration 11
+
+- Converts modules based on December Release 2015 Tiericide
+    Some modules have been unpublished (and unpublished module attributes are removed
+    from database), which causes pyfa to crash. We therefore replace these
+    modules with their new replacements
+"""
+
+CONVERSIONS = {
+    16467: (  # Medium Gremlin Compact Energy Neutralizer
+        16471,  # Medium Unstable Power Fluctuator I
+    ),
+    22947: (  # 'Beatnik' Small Remote Armor Repairer
+        23414,  # 'Brotherhood' Small Remote Armor Repairer
+    ),
+    8295 : (  # Type-D Restrained Shield Flux Coil
+        8293,  # Beta Reactor Control: Shield Flux I
+    ),
+    16499: (  # Heavy Knave Scoped Energy Nosferatu
+        16501,  # E500 Prototype Energy Vampire
+    ),
+    16477: (  # Heavy Infectious Scoped Energy Neutralizer
+        16473,  # Heavy Rudimentary Energy Destabilizer I
+    ),
+    16475: (  # Heavy Gremlin Compact Energy Neutralizer
+        16479,  # Heavy Unstable Power Fluctuator I
+    ),
+    16447: (  # Medium Solace Scoped Remote Armor Repairer
+        16445,  # Medium 'Arup' Remote Armor Repairer
+    ),
+    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
+        8341,  # Alpha Reactor Shield Power Relay
+        8345,  # Marked Generator Refitting: Shield Power Relay
+        8339,  # Partial Power Plant Manager: Shield Power Relay
+        8343,  # Type-E Power Core Modification: Shield Power Relay
+    ),
+    16439: (  # Small Solace Scoped Remote Armor Repairer
+        16437,  # Small 'Arup' Remote Armor Repairer
+    ),
+    16505: (  # Medium Ghoul Compact Energy Nosferatu
+        16511,  # Medium Diminishing Power System Drain I
+    ),
+    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
+        6491,  # Passive Barrier Compensator I
+        6489,  # 'Benefactor' Ward Reconstructor
+        6487,  # Supplemental Screen Generator I
+    ),
+    5137 : (  # Small Knave Scoped Energy Nosferatu
+        5135,  # E5 Prototype Energy Vampire
+    ),
+    8579 : (  # Medium Murky Compact Remote Shield Booster
+        8581,  # Medium 'Atonement' 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
+        4475,  # Small Unstable Power Fluctuator I
+    ),
+    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
+        5139,  # Small Diminishing Power System Drain I
+    ),
+    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
+        8333,  # Beta Reactor Control: Shield Power Relay I
+    ),
+    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
+        8637,  # Large 'Atonement' Remote Shield Booster
+    ),
+    16507: (  # Medium Knave Scoped Energy Nosferatu
+        16509,  # E50 Prototype Energy Vampire
+    ),
+}
+
+
+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/upgrade12.py

@@ -0,0 +1,340 @@
+"""
+Migration 12
+
+- Converts modules based on March 2016 Module Tiericide
+    Some modules have been unpublished (and unpublished module attributes are removed
+    from database), which causes pyfa to crash. We therefore replace these
+    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
+        7218,  # Piercing ECCM Emitter I
+    ),
+    5365 : (  # Cetus Scoped Burst Jammer
+        5359,  # 1Z-3 Subversive ECM Eruption
+    ),
+    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
+        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
+        5829,  # GLFF Containment Field
+        5831,  # Interior Force Field Array
+        5835,  # F84 Local Damage System
+        5833,  # Systematic Damage Control
+    ),
+    22925: (  # 'Bootleg' Remote Sensor Booster
+        22939,  # 'Boss' Remote Sensor Booster
+        22941,  # 'Entrepreneur' Remote Sensor Booster
+    ),
+    5443 : (  # Faint Epsilon Scoped Warp Scrambler
+        5441,  # Fleeting Progressive Warp Scrambler I
+    ),
+    1963 : (  # Remote Sensor Booster I
+        1959,  # ECCM Projector I
+    ),
+    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
+    ),
+    21486: (  # 'Kindred' Gyrostabilizer
+        21488,  # Monophonic Stabilization Actuator I
+    ),
+    19927: (  # Hypnos Scoped Magnetometric ECM
+        9518,  # Initiated Ion Field ECM I
+    ),
+    10188: (  # 'Basic' Magnetic Field Stabilizer
+        11111,  # Insulated Stabilizer Array
+        11109,  # Linear Flux Stabilizer
+        11115,  # Gauss Field Balancer
+        11113,  # Magnetic Vortex Stabilizer
+    ),
+    22919: (  # 'Monopoly' Magnetic Field Stabilizer
+        22917,  # 'Capitalist' Magnetic Field Stabilizer I
+    ),
+    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
+        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
+        5915,  # Lateral Gyrostabilizer
+        5919,  # F-M2 Weapon Inertial Suspensor
+        5913,  # Hydraulic Stabilization Actuator
+        5917,  # Stabilized Weapon Mounts
+    ),
+    19931: (  # Compulsive Scoped Multispectral ECM
+        19933,  # 'Hypnos' Multispectral ECM I
+    ),
+    5403 : (  # Faint Scoped Warp Disruptor
+        5401,  # Fleeting Warp Disruptor I
+    ),
+    23902: (  # 'Trebuchet' Heat Sink I
+        23900,  # 'Mangonel' Heat Sink I
+    ),
+    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
+        20214,  # Extra Radar ECCM Scanning Array I
+        20220,  # Extra Ladar ECCM Scanning Array I
+        20226,  # Extra Gravimetric ECCM Scanning Array I
+        20232,  # Extra Magnetometric ECCM Scanning Array I
+        7948,  # Gravimetric Positional ECCM Sensor System I
+        7964,  # Radar Positional ECCM Sensor System I
+        7965,  # Omni Positional ECCM Sensor System I
+        7966,  # Ladar Positional ECCM Sensor System I
+        7970,  # Magnetometric Positional ECCM Sensor System I
+        20218,  # Conjunctive Radar ECCM Scanning Array I
+        20224,  # Conjunctive Ladar ECCM Scanning Array I
+        20230,  # Conjunctive Gravimetric ECCM Scanning Array I
+        20236,  # Conjunctive Magnetometric ECCM Scanning Array I
+        6157,  # Supplemental Scanning CPU I
+    ),
+    23418: (  # 'Radical' Damage Control
+        22893,  # 'Gonzo' Damage Control I
+    ),
+    19952: (  # Umbra Scoped Radar ECM
+        9520,  # 'Penumbra' White Noise ECM
+    ),
+    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
+        7219,  # Scattering ECCM Projector 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
+        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
+        1960,  # ECCM Projector II
+    ),
+    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
+        4029,  # 'Langour' Drive Disruptor I
+    ),
+    4027 : (  # Fleeting Compact Stasis Webifier
+        4031,  # Patterned Stasis Web I
+    ),
+    22937: (  # 'Enterprise' Remote Tracking Computer
+        22935,  # 'Tycoon' Remote Tracking Computer
+    ),
+    22929: (  # 'Marketeer' Tracking Computer
+        22927,  # 'Economist' Tracking Computer I
+    ),
+    1987 : (  # Signal Amplifier II
+        2580,  # Gravimetric Backup Array II
+        2584,  # Ladar Backup Array II
+        2588,  # Magnetometric Backup Array II
+        2592,  # Multi Sensor Backup Array II
+        4014,  # RADAR Backup Array II
+    ),
+    19939: (  # Enfeebling Scoped Ladar ECM
+        9522,  # Faint Phase Inversion ECM I
+    ),
+    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
+        1946,  # Basic RADAR Backup Array
+        1982,  # Basic Ladar Backup Array
+        1983,  # Basic Gravimetric Backup Array
+        1984,  # Basic Magnetometric Backup Array
+        1985,  # Basic Multi Sensor Backup Array
+        6193,  # Emergency Magnetometric Scanners
+        6194,  # Emergency Multi-Frequency Scanners
+        6202,  # Emergency RADAR Scanners
+        6216,  # Emergency Ladar Scanners
+        6217,  # Emergency Gravimetric Scanners
+        6225,  # Sealed RADAR Backup Cluster
+        6238,  # Sealed Magnetometric Backup Cluster
+        6239,  # Sealed Multi-Frequency Backup Cluster
+        6241,  # Sealed Ladar Backup Cluster
+        6242,  # Sealed Gravimetric Backup Cluster
+        6257,  # Surplus RADAR Reserve Array
+        6258,  # F-42 Reiterative RADAR Backup Sensors
+        6283,  # Surplus Magnetometric Reserve Array
+        6284,  # F-42 Reiterative Magnetometric Backup Sensors
+        6285,  # Surplus Multi-Frequency Reserve Array
+        6286,  # F-42 Reiterative Multi-Frequency Backup Sensors
+        6289,  # Surplus Ladar Reserve Array
+        6290,  # F-42 Reiterative Ladar Backup Sensors
+        6291,  # Surplus Gravimetric Reserve Array
+        6292,  # F-42 Reiterative Gravimetric Backup Sensors
+        6309,  # Amplitude Signal Enhancer
+        6310,  # 'Acolyth' Signal Booster
+        6311,  # Type-E Discriminative Signal Augmentation
+        6312,  # F-90 Positional Signal Amplifier
+    ),
+    21527: (  # 'Firewall' Signal Amplifier
+        21521,  # Gravimetric Firewall
+        21523,  # Ladar Firewall
+        21525,  # Magnetometric Firewall
+        21527,  # Multi Sensor Firewall
+        21529,  # RADAR Firewall
+    ),
+    23416: (  # 'Peace' Large Remote Armor Repairer
+        None,  # 'Pacifier' Large Remote Armor Repairer
+    ),
+    6176 : (  # F-12 Enduring Tracking Computer
+        6174,  # Monopulse Tracking Mechanism I
+    ),
+    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
+        7926,  # Alumel Omni ECCM Sensor Array I
+        7937,  # Alumel Magnetometric ECCM Sensor Array I
+        7867,  # Supplemental Ladar ECCM Scanning Array I
+        7869,  # Supplemental Gravimetric ECCM Scanning Array I
+        7870,  # Supplemental Omni ECCM Scanning Array I
+        7887,  # Supplemental Radar ECCM Scanning Array I
+        7889,  # Supplemental Magnetometric ECCM Scanning Array I
+        20216,  # Incremental Radar ECCM Scanning Array I
+        20222,  # Incremental Ladar ECCM Scanning Array I
+        20228,  # Incremental Gravimetric ECCM Scanning Array I
+        20234,  # Incremental Magnetometric ECCM Scanning Array I
+        7892,  # Prototype ECCM Radar Sensor Cluster
+        7893,  # Prototype ECCM Ladar Sensor Cluster
+        7895,  # Prototype ECCM Gravimetric Sensor Cluster
+        7896,  # Prototype ECCM Omni Sensor Cluster
+        7914,  # Prototype ECCM Magnetometric Sensor Cluster
+        6158,  # Prototype Sensor Booster
+    ),
+    5849 : (  # Extruded Compact Heat Sink
+        5846,  # Thermal Exhaust System I
+        5858,  # C4S Coiled Circuit Thermal Radiator
+        5857,  # 'Skadi' Coolant System I
+    ),
+    22895: (  # 'Shady' Sensor Booster
+        22897,  # 'Forger' ECCM - Magnetometric I
+    ),
+    11105: (  # Vortex Compact Magnetic Field Stabilizer
+        11103,  # Insulated Stabilizer Array I
+        11101,  # Linear Flux Stabilizer I
+        11107,  # Gauss Field Balancer I
+    ),
+    22945: (  # 'Executive' Remote Sensor Dampener
+        22943,  # 'Broker' Remote Sensor Dampener I
+    ),
+    6173 : (  # Optical Compact Tracking Computer
+        6175,  # 'Orion' Tracking CPU I
+    ),
+    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
+        4791,  # Small Ohm Capacitor Reserve I
+        4785,  # Small F-4a Ld-Sulfate Capacitor Charge Unit
+        4789,  # Small Peroxide Capacitor Power Cell
+    ),
+    19946: (  # BZ-5 Scoped Gravimetric ECM
+        9519,  # FZ-3 Subversive Spatial Destabilizer ECM
+    ),
+    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
+    ),
+    21484: (  # 'Full Duplex' Ballistic Control System
+        21482,  # Ballistic 'Purge' Targeting System I
+    ),
+    6296 : (  # F-89 Compact Signal Amplifier
+        6218,  # Protected Gravimetric Backup Cluster I
+        6222,  # Protected Ladar Backup Cluster I
+        6226,  # Protected Magnetometric Backup Cluster I
+        6230,  # Protected Multi-Frequency Backup Cluster I
+        6234,  # Protected RADAR Backup Cluster I
+        6195,  # Reserve Gravimetric Scanners
+        6199,  # Reserve Ladar Scanners
+        6203,  # Reserve Magnetometric Scanners
+        6207,  # Reserve Multi-Frequency Scanners
+        6212,  # Reserve RADAR Scanners
+        20238,  # Secure Gravimetric Backup Cluster I
+        20244,  # Secure Ladar Backup Cluster I
+        20250,  # Secure Magnetometric Backup Cluster I
+        20260,  # Secure Radar Backup Cluster I
+        6244,  # F-43 Repetitive Gravimetric Backup Sensors
+        6252,  # F-43 Repetitive Ladar Backup Sensors
+        6260,  # F-43 Repetitive Magnetometric Backup Sensors
+        6268,  # F-43 Repetitive Multi-Frequency Backup Sensors
+        6276,  # F-43 Repetitive RADAR Backup Sensors
+        20240,  # Shielded Gravimetric Backup Cluster I
+        20246,  # Shielded Ladar Backup Cluster I
+        20252,  # Shielded Magnetometric Backup Cluster I
+        20262,  # Shielded Radar Backup Cluster I
+        6243,  # Surrogate Gravimetric Reserve Array I
+        6251,  # Surrogate Ladar Reserve Array I
+        6259,  # Surrogate Magnetometric Reserve Array I
+        6267,  # Surrogate Multi-Frequency Reserve Array I
+        6275,  # Surrogate RADAR Reserve Array I
+        20242,  # Warded Gravimetric Backup Cluster I
+        20248,  # Warded Ladar Backup Cluster I
+        20254,  # Warded Magnetometric Backup Cluster I
+        20264,  # Warded Radar Backup Cluster I
+        6294,  # 'Mendicant' Signal Booster I
+        6293,  # Wavelength Signal Enhancer I
+        6295,  # Type-D Attenuation Signal Augmentation
+    ),
+    5302 : (  # Phased Muon Scoped Sensor Dampener
+        5300,  # Indirect Scanning Dampening Unit I
+    ),
+}
+
+
+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/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,46 @@
+"""
+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 (KeyboardInterrupt, SystemExit):
+                    raise
+                except Exception:
+                    pass
+        saveddata_session.commit()
+    except (KeyboardInterrupt, SystemExit):
+        raise
+    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

@@ -0,0 +1,22 @@
+"""
+Migration 2
+
+- Includes old upgrade paths pre-1.5.0. See GH issue #190 for why this is needed
+"""
+
+import sqlalchemy
+
+
+def upgrade(saveddata_engine):
+    # Update characters schema to include default chars
+    try:
+        saveddata_engine.execute("SELECT defaultChar, chars FROM characters LIMIT 1")
+    except sqlalchemy.exc.DatabaseError:
+        saveddata_engine.execute("ALTER TABLE characters ADD COLUMN defaultChar INTEGER")
+        saveddata_engine.execute("ALTER TABLE characters ADD COLUMN chars VARCHAR")
+
+    # Update fits schema to include booster attribute
+    try:
+        saveddata_engine.execute("SELECT booster FROM fits LIMIT 1")
+    except sqlalchemy.exc.DatabaseError:
+        saveddata_engine.execute("ALTER TABLE fits ADD COLUMN booster BOOLEAN")

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/upgrade28.py

@@ -0,0 +1,18 @@
+"""
+Migration 28
+
+- adds baseItemID and mutaplasmidID to modules table
+"""
+import sqlalchemy
+
+
+def upgrade(saveddata_engine):
+    try:
+        saveddata_engine.execute("SELECT baseItemID FROM modules LIMIT 1")
+    except sqlalchemy.exc.DatabaseError:
+        saveddata_engine.execute("ALTER TABLE modules ADD COLUMN baseItemID INT;")
+
+    try:
+        saveddata_engine.execute("SELECT mutaplasmidID FROM modules LIMIT 1")
+    except sqlalchemy.exc.DatabaseError:
+        saveddata_engine.execute("ALTER TABLE modules ADD COLUMN mutaplasmidID INT;")

eos/db/migrations/upgrade29.py

@@ -0,0 +1,18 @@
+"""
+Migration 29
+
+- adds spoolType and spoolAmount to modules table
+"""
+import sqlalchemy
+
+
+def upgrade(saveddata_engine):
+    try:
+        saveddata_engine.execute("SELECT spoolType FROM modules LIMIT 1")
+    except sqlalchemy.exc.DatabaseError:
+        saveddata_engine.execute("ALTER TABLE modules ADD COLUMN spoolType INT;")
+
+    try:
+        saveddata_engine.execute("SELECT spoolAmount FROM modules LIMIT 1")
+    except sqlalchemy.exc.DatabaseError:
+        saveddata_engine.execute("ALTER TABLE modules ADD COLUMN spoolAmount FLOAT;")

eos/db/migrations/upgrade3.py

@@ -0,0 +1,14 @@
+"""
+Migration 3
+
+- Adds mode column for fits (t3 dessy)
+"""
+
+import sqlalchemy
+
+
+def upgrade(saveddata_engine):
+    try:
+        saveddata_engine.execute("SELECT modeID FROM fits LIMIT 1")
+    except sqlalchemy.exc.DatabaseError:
+        saveddata_engine.execute("ALTER TABLE fits ADD COLUMN modeID INTEGER")

eos/db/migrations/upgrade30.py

@@ -0,0 +1,17 @@
+"""
+Migration 30
+
+- changes to prices table
+"""
+
+
+import sqlalchemy
+
+
+def upgrade(saveddata_engine):
+    try:
+        saveddata_engine.execute("SELECT status FROM prices LIMIT 1")
+    except sqlalchemy.exc.DatabaseError:
+        # Just drop table, table will be re-created by sqlalchemy and
+        # data will be re-fetched
+        saveddata_engine.execute("DROP TABLE prices;")

eos/db/migrations/upgrade31.py

@@ -0,0 +1,15 @@
+"""
+Migration 31
+
+- added fit system security column
+"""
+
+
+import sqlalchemy
+
+
+def upgrade(saveddata_engine):
+    try:
+        saveddata_engine.execute("SELECT systemSecurity FROM fits LIMIT 1")
+    except sqlalchemy.exc.DatabaseError:
+        saveddata_engine.execute("ALTER TABLE fits ADD COLUMN systemSecurity INT")

eos/db/migrations/upgrade32.py

@@ -0,0 +1,16 @@
+"""
+Migration 32
+
+- added speed, sig and radius columns to targetResists table
+"""
+
+
+import sqlalchemy
+
+
+def upgrade(saveddata_engine):
+    for column in ('maxVelocity', 'signatureRadius', 'radius'):
+        try:
+            saveddata_engine.execute("SELECT {} FROM targetResists LIMIT 1;".format(column))
+        except sqlalchemy.exc.DatabaseError:
+            saveddata_engine.execute("ALTER TABLE targetResists ADD COLUMN {} FLOAT;".format(column))

eos/db/migrations/upgrade33.py

@@ -0,0 +1,30 @@
+"""
+Migration 33
+
+Allow use of floats in damage pattern values
+"""
+
+tmpTable = """
+CREATE TABLE "damagePatternsTemp" (
+	"ID" INTEGER NOT NULL,
+	"name" VARCHAR,
+	"emAmount" FLOAT,
+	"thermalAmount" FLOAT,
+	"kineticAmount" FLOAT,
+	"explosiveAmount" FLOAT,
+	"ownerID" INTEGER,
+	"created" DATETIME,
+	"modified" DATETIME,
+	PRIMARY KEY ("ID"),
+	FOREIGN KEY("ownerID") REFERENCES users ("ID")
+)
+"""
+
+
+def upgrade(saveddata_engine):
+    saveddata_engine.execute(tmpTable)
+    saveddata_engine.execute(
+            'INSERT INTO damagePatternsTemp (ID, name, emAmount, thermalAmount, kineticAmount, explosiveAmount, ownerID, created, modified) '
+            'SELECT ID, name, emAmount, thermalAmount, kineticAmount, explosiveAmount, ownerID, created, modified FROM damagePatterns')
+    saveddata_engine.execute('DROP TABLE damagePatterns')
+    saveddata_engine.execute('ALTER TABLE damagePatternsTemp RENAME TO damagePatterns')

eos/db/migrations/upgrade34.py

@@ -0,0 +1,25 @@
+"""
+Migration 34
+
+- Adds projection range columns to projectable entities
+"""
+import sqlalchemy
+
+
+def upgrade(saveddata_engine):
+    try:
+        saveddata_engine.execute("SELECT projectionRange FROM projectedFits LIMIT 1")
+    except sqlalchemy.exc.DatabaseError:
+        saveddata_engine.execute("ALTER TABLE projectedFits ADD COLUMN projectionRange FLOAT;")
+    try:
+        saveddata_engine.execute("SELECT projectionRange FROM modules LIMIT 1")
+    except sqlalchemy.exc.DatabaseError:
+        saveddata_engine.execute("ALTER TABLE modules ADD COLUMN projectionRange FLOAT;")
+    try:
+        saveddata_engine.execute("SELECT projectionRange FROM drones LIMIT 1")
+    except sqlalchemy.exc.DatabaseError:
+        saveddata_engine.execute("ALTER TABLE drones ADD COLUMN projectionRange FLOAT;")
+    try:
+        saveddata_engine.execute("SELECT projectionRange FROM fighters LIMIT 1")
+    except sqlalchemy.exc.DatabaseError:
+        saveddata_engine.execute("ALTER TABLE fighters ADD COLUMN projectionRange FLOAT;")

eos/db/migrations/upgrade35.py

@@ -0,0 +1,166 @@
+"""
+Migration 35
+
+- Remove builtin damage patterns and target profiles from the database
+"""
+
+import sqlalchemy
+
+
+dmgPatterns = (
+    'Uniform',
+    '[Bombs]Concussion Bomb',
+    '[Bombs]Electron Bomb',
+    '[Bombs]Scorch Bomb',
+    '[Bombs]Shrapnel Bomb',
+    '[Exotic Plasma]Baryon',
+    '[Exotic Plasma]Meson',
+    '[Exotic Plasma]Tetryon',
+    '[Exotic Plasma][T2] Mystic',
+    '[Exotic Plasma][T2] Occult',
+    '[Frequency Crystals]Gamma',
+    '[Frequency Crystals]Infrared',
+    '[Frequency Crystals]Microwave',
+    '[Frequency Crystals]Multifrequency',
+    '[Frequency Crystals]Radio',
+    '[Frequency Crystals]Standard',
+    '[Frequency Crystals]Ultraviolet',
+    '[Frequency Crystals]Xray',
+    '[Frequency Crystals][T2] Aurora',
+    '[Frequency Crystals][T2] Conflagration',
+    '[Frequency Crystals][T2] Gleam',
+    '[Frequency Crystals][T2] Scorch',
+    '[Generic]EM',
+    '[Generic]Explosive',
+    '[Generic]Kinetic',
+    '[Generic]Thermal',
+    '[Hybrid Charges]Antimatter',
+    '[Hybrid Charges]Iridium',
+    '[Hybrid Charges]Iron',
+    '[Hybrid Charges]Lead',
+    '[Hybrid Charges]Plutonium',
+    '[Hybrid Charges]Thorium',
+    '[Hybrid Charges]Tungsten',
+    '[Hybrid Charges]Uranium',
+    '[Hybrid Charges][T2] Javelin',
+    '[Hybrid Charges][T2] Null',
+    '[Hybrid Charges][T2] Spike',
+    '[Hybrid Charges][T2] Void',
+    '[Missiles]Inferno',
+    '[Missiles]Mjolnir',
+    '[Missiles]Nova',
+    '[Missiles]Scourge',
+    '[Missiles][Structure) Standup Missile',
+    '[Missiles][Structure] Standup Missile',
+    '[NPC][Asteroid] Angel Cartel',
+    '[NPC][Asteroid] Blood Raiders',
+    '[NPC][Asteroid] Guristas',
+    '[NPC][Asteroid] Rogue Drone',
+    '[NPC][Asteroid] Sanshas Nation',
+    '[NPC][Asteroid] Serpentis',
+    '[NPC][Burner] Ashimmu (Blood Raiders)',
+    '[NPC][Burner] Cruor (Blood Raiders)',
+    '[NPC][Burner] Daredevil (Serpentis)',
+    '[NPC][Burner] Dramiel (Angel)',
+    '[NPC][Burner] Enyo',
+    '[NPC][Burner] Hawk',
+    '[NPC][Burner] Jaguar',
+    '[NPC][Burner] Sentinel',
+    '[NPC][Burner] Succubus (Sanshas Nation)',
+    '[NPC][Burner] Talos',
+    '[NPC][Burner] Vengeance',
+    '[NPC][Burner] Worm (Guristas)',
+    '[NPC][Deadspace] Angel Cartel',
+    '[NPC][Deadspace] Blood Raiders',
+    '[NPC][Deadspace] Guristas',
+    '[NPC][Deadspace] Rogue Drone',
+    '[NPC][Deadspace] Sanshas Nation',
+    '[NPC][Deadspace] Serpentis',
+    '[NPC][Mission] Amarr Empire',
+    '[NPC][Mission] CONCORD',
+    '[NPC][Mission] Caldari State',
+    '[NPC][Mission] Gallente Federation',
+    '[NPC][Mission] Khanid',
+    '[NPC][Mission] Minmatar Republic',
+    '[NPC][Mission] Mordus Legion',
+    '[NPC][Mission] Thukker',
+    '[NPC][Other] Sansha Incursion',
+    '[NPC][Other] Sleepers',
+    '[Projectile Ammo]Carbonized Lead',
+    '[Projectile Ammo]Depleted Uranium',
+    '[Projectile Ammo]EMP',
+    '[Projectile Ammo]Fusion',
+    '[Projectile Ammo]Nuclear',
+    '[Projectile Ammo]Phased Plasma',
+    '[Projectile Ammo]Proton',
+    '[Projectile Ammo]Titanium Sabot',
+    '[Projectile Ammo][T2] Barrage',
+    '[Projectile Ammo][T2] Hail',
+    '[Projectile Ammo][T2] Quake',
+    '[Projectile Ammo][T2] Tremor')
+
+tgtProfiles = (
+    'Uniform (25%)',
+    'Uniform (50%)',
+    'Uniform (75%)',
+    'Uniform (90%)',
+    '[NPC][Asteroid] Angel Cartel',
+    '[NPC][Asteroid] Blood Raiders',
+    '[NPC][Asteroid] Guristas',
+    '[NPC][Asteroid] Rogue Drones',
+    '[NPC][Asteroid] Sanshas Nation',
+    '[NPC][Asteroid] Serpentis',
+    '[NPC][Burner] Ashimmu (Blood Raiders)',
+    '[NPC][Burner] Cruor (Blood Raiders)',
+    '[NPC][Burner] Daredevil (Serpentis)',
+    '[NPC][Burner] Dramiel (Angel)',
+    '[NPC][Burner] Enyo',
+    '[NPC][Burner] Hawk',
+    '[NPC][Burner] Jaguar',
+    '[NPC][Burner] Sentinel',
+    '[NPC][Burner] Succubus (Sanshas Nation)',
+    '[NPC][Burner] Talos',
+    '[NPC][Burner] Vengeance',
+    '[NPC][Burner] Worm (Guristas)',
+    '[NPC][Deadspace] Angel Cartel',
+    '[NPC][Deadspace] Blood Raiders',
+    '[NPC][Deadspace] Guristas',
+    '[NPC][Deadspace] Rogue Drones',
+    '[NPC][Deadspace] Sanshas Nation',
+    '[NPC][Deadspace] Serpentis',
+    '[NPC][Mission] Amarr Empire',
+    '[NPC][Mission] CONCORD',
+    '[NPC][Mission] Caldari State',
+    '[NPC][Mission] Gallente Federation',
+    '[NPC][Mission] Khanid',
+    '[NPC][Mission] Minmatar Republic',
+    '[NPC][Mission] Mordus Legion',
+    '[NPC][Other] Sansha Incursion',
+    '[NPC][Other] Sleeper',
+    '[T1 Resist]Armor',
+    '[T1 Resist]Armor (+T2 DCU)',
+    '[T1 Resist]Hull',
+    '[T1 Resist]Hull (+T2 DCU)',
+    '[T1 Resist]Shield',
+    '[T1 Resist]Shield (+T2 DCU)',
+    '[T2 Resist]Amarr (Armor)',
+    '[T2 Resist]Amarr (Shield)',
+    '[T2 Resist]Caldari (Armor)',
+    '[T2 Resist]Caldari (Shield)',
+    '[T2 Resist]Gallente (Armor)',
+    '[T2 Resist]Gallente (Shield)',
+    '[T2 Resist]Minmatar (Armor)',
+    '[T2 Resist]Minmatar (Shield)')
+
+
+def upgrade(saveddata_engine):
+    saveddata_engine.execute('DELETE FROM damagePatterns WHERE name in ({});'.format(', '.join('\'{}\''.format(n) for n in dmgPatterns)))
+    saveddata_engine.execute('DELETE FROM targetResists WHERE name in ({});'.format(', '.join('\'{}\''.format(n) for n in tgtProfiles)))
+    try:
+        saveddata_engine.execute("SELECT builtinDamagePatternID FROM fits LIMIT 1")
+    except sqlalchemy.exc.DatabaseError:
+        saveddata_engine.execute("ALTER TABLE fits ADD COLUMN builtinDamagePatternID INT;")
+    try:
+        saveddata_engine.execute("SELECT builtinTargetResistsID FROM fits LIMIT 1")
+    except sqlalchemy.exc.DatabaseError:
+        saveddata_engine.execute("ALTER TABLE fits ADD COLUMN builtinTargetResistsID INT;")

eos/db/migrations/upgrade36.py

@@ -0,0 +1,84 @@
+"""
+Migration 36
+
+- Shield Booster, Armor Repairer and Capacitor Transfer tiericide
+"""
+
+CONVERSIONS = {
+    6441: (  # Small Clarity Ward Enduring Shield Booster
+        6443,  # Small Converse Deflection Catalyzer
+    ),
+    6437: (  # Small C5-L Compact Shield Booster
+        6439,  # Small Neutron Saturation Injector I
+    ),
+    10868: (  # Medium Clarity Ward Enduring Shield Booster
+        10870,  # Medium Converse Deflection Catalyzer
+    ),
+    10872: (  # Medium C5-L Compact Shield Booster
+        10866,  # Medium Neutron Saturation Injector I
+    ),
+    10876: (  # Large Clarity Ward Enduring Shield Booster
+        10878,  # Large Converse Deflection Catalyzer
+    ),
+    10880: (  # Large C5-L Compact Shield Booster
+        10874,  # Large Neutron Saturation Injector I
+    ),
+    10884: (  # X-Large Clarity Ward Enduring Shield Booster
+        10886,  # X-Large Converse Deflection Catalyzer
+    ),
+    10888: (  # X-Large C5-L Compact Shield Booster
+        10882,  # X-Large Neutron Saturation Injector I
+    ),
+    4533: (  # Small ACM Compact Armor Repairer
+        4531,  # Small Inefficient Armor Repair Unit
+    ),
+    4529: (  # Small I-a Enduring Armor Repairer
+        4535,  # Small Automated Carapace Restoration
+    ),
+    4573: (  # Medium ACM Compact Armor Repairer
+        4571,  # Medium Inefficient Armor Repair Unit
+    ),
+    4569: (  # Medium I-a Enduring Armor Repairer
+        4575,  # Medium Automated Carapace Restoration
+    ),
+    22889: (  # 'Meditation' Medium Armor Repairer I
+        4579,  # Medium Nano Armor Repair Unit I
+    ),
+    4613: (  # Large ACM Compact Armor Repairer
+        4611,  # Large Inefficient Armor Repair Unit
+    ),
+    4609: (  # Large I-a Enduring Armor Repairer
+        4615,  # Large Automated Carapace Restoration
+    ),
+    22891: (  # 'Protest' Large Armor Repairer I
+        4621,  # Large 'Reprieve' Vestment Reconstructer I
+    ),
+    5093: (  # Small Radiative Scoped Remote Capacitor Transmitter
+        5087,  # Small Partial E95a Remote Capacitor Transmitter
+    ),
+    5091: (  # Small Inductive Compact Remote Capacitor Transmitter
+        5089,  # Small Murky Remote Capacitor Transmitter
+    ),
+    16489: (  # Medium Radiative Scoped Remote Capacitor Transmitter
+        16493,  # Medium Partial E95b Remote Capacitor Transmitter
+    ),
+    16495: (  # Medium Inductive Compact Remote Capacitor Transmitter
+        16491,  # Medium Murky Remote Capacitor Transmitter
+    ),
+    16481: (  # Large Radiative Scoped Remote Capacitor Transmitter
+        16485,  # Large Partial E95c Remote Capacitor Transmitter
+    ),
+    16487: (  # Large Inductive Compact Remote Capacitor Transmitter
+        16483,  # Large Murky Remote Capacitor Transmitter
+    )
+}
+
+
+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/upgrade37.py

@@ -0,0 +1,44 @@
+"""
+Migration 37
+
+- Capacitor Booster tiericide
+"""
+
+CONVERSIONS = {
+    4959: (  # 'Seed' Micro Capacitor Booster I
+        4957,  # Micro Brief Capacitor Overcharge I
+        4961,  # Micro Tapered Capacitor Infusion I
+        4955,  # Micro F-RX Prototype Capacitor Boost
+        3556,  # Micro Capacitor Booster I
+        3558,  # Micro Capacitor Booster II
+        15774,  # Ammatar Navy Micro Capacitor Booster
+        14180,  # Dark Blood Micro Capacitor Booster
+        14182,  # True Sansha Micro Capacitor Booster
+        15782,  # Imperial Navy Micro Capacitor Booster
+    ),
+    5011: (  # Small F-RX Compact Capacitor Booster
+        5009,  # Small Brief Capacitor Overcharge I
+        5013,  # Small Tapered Capacitor Infusion I
+        5007,  # Small F-RX Prototype Capacitor Boost
+    ),
+    4833: (  # Medium F-RX Compact Capacitor Booster
+        4831,  # Medium Brief Capacitor Overcharge I
+        4835,  # Medium Tapered Capacitor Infusion I
+        4829,  # Medium F-RX Prototype Capacitor Boost
+    ),
+    5051: (  # Heavy F-RX Compact Capacitor Booster
+        5049,  # Heavy Brief Capacitor Overcharge I
+        5053,  # Heavy Tapered Capacitor Infusion I
+        5047,  # Heavy F-RX Prototype Capacitor Boost
+    )
+}
+
+
+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/upgrade38.py

@@ -0,0 +1,42 @@
+"""
+Migration 38
+
+- Armor hardener tiericide
+"""
+
+CONVERSIONS = {
+    16357: (  # Experimental Enduring EM Armor Hardener I
+        16353,  # Upgraded Armor EM Hardener I
+    ),
+    16365: (  # Experimental Enduring Explosive Armor Hardener I
+        16361,  # Upgraded Armor Explosive Hardener I
+    ),
+    16373: (  # Experimental Enduring Kinetic Armor Hardener I
+        16369,  # Upgraded Armor Kinetic Hardener I
+    ),
+    16381: (  # Experimental Enduring Thermal Armor Hardener I
+        16377,  # Upgraded Armor Thermal Hardener I
+    ),
+    16359: (  # Prototype Compact EM Armor Hardener I
+        16355,  # Limited Armor EM Hardener I
+    ),
+    16367: (  # Prototype Compact Explosive Armor Hardener I
+        16363,  # Limited Armor Explosive Hardener I
+    ),
+    16375: (  # Prototype Compact Kinetic Armor Hardener I
+        16371,  # Limited Armor Kinetic Hardener I
+    ),
+    16383: (  # Prototype Compact Thermal Armor Hardener I
+        16379,  # Limited Armor Thermal Hardener I
+    )
+}
+
+
+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/upgrade39.py

@@ -0,0 +1,34 @@
+"""
+Migration 39
+
+- Shield amplifier tiericide
+- CCP getting rid of DB TDs due to exploits
+"""
+
+CONVERSIONS = {
+    1798: (  # 'Basic' EM Shield Amplifier
+        9562,  # Supplemental EM Ward Amplifier
+    ),
+    1804: (  # 'Basic' Explosive Shield Amplifier
+        9574,  # Supplemental Explosive Deflection Amplifier
+    ),
+    1802: (  # 'Basic' Kinetic Shield Amplifier
+        9570,  # Supplemental Kinetic Deflection Amplifier
+    ),
+    1800: (  # 'Basic' Thermal Shield Amplifier
+        9566,  # Supplemental Thermal Dissipation Amplifier
+    ),
+    22933: (  # 'Investor' Tracking Disruptor I
+        32416,  # Dark Blood Tracking Disruptor
+    )
+}
+
+
+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/upgrade4.py

@@ -0,0 +1,141 @@
+"""
+Migration 4
+
+- Converts modules based on Proteus Module Tiericide
+    Some modules have been unpublished (and unpublished module attributes are removed
+    from database), which causes pyfa to crash. We therefore replace these
+    modules with their new replacements
+
+    Based on http://community.eveonline.com/news/patch-notes/patch-notes-for-proteus/
+    and output of itemDiff.py
+"""
+
+CONVERSIONS = {
+    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
+        8173,  # Beta Reactor Control: Capacitor Power Relay I
+    ),
+    8175 : (  # Type-D Restrained Capacitor Power Relay
+        8171,  # Local Power Plant Manager: Capacity Power Relay I
+    ),
+
+    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
+        4433,  # Barton Reactor Capacitor Recharger I
+        4431,  # F-b10 Nominal Capacitor Regenerator
+        4437,  # Fixed Parallel Link-Capacitor I
+    ),
+
+    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
+        5491,  # Beta Hull Mod Expanded Cargo
+        5489,  # Local Hull Conversion Expanded Cargo I
+        5487,  # Mark I Modified SS Expanded Cargo
+    ),
+
+    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
+        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
+        5241,  # Dual Diode Mining Laser I
+    ),
+    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
+        5243,  # XeCl Drilling Beam I
+    ),
+
+    22619: (  # Frigoris Restrained Ice Harvester Upgrade
+        22617,  # Crisium Ice Harvester Upgrade
+    ),
+    22611: (  # Elara Restrained Mining Laser Upgrade
+        22609,  # Erin Mining Laser Upgrade
+    ),
+
+    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
+        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
+        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
+        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
+        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
+        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
+        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
+        5645,  # Beta Hull Mod 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.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/upgrade40.py

@@ -0,0 +1,18 @@
+"""
+Migration 40
+
+Imports all item conversions since Migration 28 and runs them against module.baseItemID. This column seems to have been
+forgotten about since it's been added.
+
+"""
+from .upgrade36 import CONVERSIONS as u36
+from .upgrade37 import CONVERSIONS as u37
+from .upgrade38 import CONVERSIONS as u38
+from .upgrade39 import CONVERSIONS as u39
+
+def upgrade(saveddata_engine):
+    for conversions in [u36, u37, u38, u39]:
+        for replacement_item, list in conversions.items():
+            for retired_item in list:
+                saveddata_engine.execute('UPDATE "modules" SET "baseItemID" = ? WHERE "baseItemID" = ?',
+                               (replacement_item, retired_item))

eos/db/migrations/upgrade41.py

@@ -0,0 +1,50 @@
+"""
+Migration 41
+
+- Resistance plating tiericide
+"""
+
+CONVERSIONS = {
+    16345: (  # Upgraded Layered Coating I
+        16347,  # Limited Layered Plating I
+        16349,  # 'Scarab' Layered Plating I
+        16351,  # 'Grail' Layered Plating I
+    ),
+    16305: (  # Upgraded Multispectrum Coating I
+        16307,  # Limited Adaptive Nano Plating I
+        16309,  # 'Collateral' Adaptive Nano Plating I
+        16311,  # 'Refuge' Adaptive Nano Plating I
+    ),
+    16329: (  # Upgraded EM Coating I
+        16331,  # Limited EM Plating I
+        16333,  # 'Contour' EM Plating I
+        16335,  # 'Spiegel' EM Plating I
+    ),
+    16321: (  # Upgraded Explosive Coating I
+        16323,  # Limited Explosive Plating I
+        16325,  # Experimental Explosive Plating I
+        16319,  # 'Aegis' Explosive Plating I
+    ),
+    16313: (  # Upgraded Kinetic Coating I
+        16315,  # Limited Kinetic Plating I
+        16317,  # Experimental Kinetic Plating I
+        16327,  # 'Element' Kinetic Plating I
+    ),
+    16337: (  # Upgraded Thermal Coating I
+        16339,  # Limited Thermal Plating I
+        16341,  # Experimental Thermal Plating I
+        16343,  # Prototype Thermal Plating I
+    )
+}
+
+
+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 "modules" SET "baseItemID" = ? WHERE "baseItemID" = ?',
+                                     (replacement_item, retired_item))
+            saveddata_engine.execute('UPDATE "cargo" SET "itemID" = ? WHERE "itemID" = ?',
+                                     (replacement_item, retired_item))

eos/db/migrations/upgrade42.py

@@ -0,0 +1,50 @@
+"""
+Migration 42
+
+- Resistance membrane tiericide
+"""
+
+CONVERSIONS = {
+    16391: (  # Compact Multispectrum Energized Membrane
+        16389,  # Experimental Energized Adaptive Nano Membrane I
+        16387,  # Limited Energized Adaptive Nano Membrane I
+        16385,  # Upgraded Energized Adaptive Nano Membrane I
+    ),
+    16423: (  # Compact Layered Energized Membrane
+        16421,  # Experimental Energized Armor Layering Membrane I
+        16419,  # Limited Energized Armor Layering Membrane I
+        16417,  # Upgraded Energized Armor Layering Membrane I
+    ),
+    16415: (  # Compact EM Energized Membrane
+        16413,  # Experimental Energized EM Membrane I
+        16411,  # Limited Energized EM Membrane I
+        16409,  # Upgraded Energized EM Membrane I
+    ),
+    16407: (  # Compact Explosive Energized Membrane
+        16405,  # Experimental Energized Explosive Membrane I
+        16403,  # Limited Energized Explosive Membrane I
+        16401,  # Upgraded Energized Explosive Membrane I
+    ),
+    16399: (  # Compact Kinetic Energized Membrane
+        16397,  # Experimental Energized Kinetic Membrane I
+        16395,  # Limited Energized Kinetic Membrane I
+        16393,  # Upgraded Energized Kinetic Membrane I
+    ),
+    16431: (  # Compact Thermal Energized Membrane
+        16429,  # Experimental Energized Thermal Membrane I
+        16427,  # Limited Energized Thermal Membrane I
+        16425,  # Upgraded Energized Thermal Membrane I
+    )
+}
+
+
+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 "modules" SET "baseItemID" = ? WHERE "baseItemID" = ?',
+                                     (replacement_item, retired_item))
+            saveddata_engine.execute('UPDATE "cargo" SET "itemID" = ? WHERE "itemID" = ?',
+                                     (replacement_item, retired_item))

eos/db/migrations/upgrade43.py

@@ -0,0 +1,26 @@
+"""
+Migration 43
+
+- Shield booster amplifier tiericide
+"""
+
+CONVERSIONS = {
+    16533: (  # Stalwart Restrained Shield Boost Amplifier
+        16531,  # 5a Prototype Shield Support I
+    ),
+    16535: (  # Copasetic Compact Shield Boost Amplifier
+        16529,  # Ionic Field Accelerator I
+    ),
+}
+
+
+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 "modules" SET "baseItemID" = ? WHERE "baseItemID" = ?',
+                                     (replacement_item, retired_item))
+            saveddata_engine.execute('UPDATE "cargo" SET "itemID" = ? WHERE "itemID" = ?',
+                                     (replacement_item, retired_item))

eos/db/migrations/upgrade44.py

@@ -0,0 +1,25 @@
+"""
+Migration 44
+
+- Signal distortion amplifier tiericide
+"""
+
+CONVERSIONS = {
+    25565: (  # Hypnos Compact Signal Distortion Amplifier I
+        25571,  # Initiated Signal Distortion Amplifier I
+        25569,  # Induced Signal Distortion Amplifier I
+        25567,  # Compulsive Signal Distortion Amplifier I
+    ),
+}
+
+
+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 "modules" SET "baseItemID" = ? WHERE "baseItemID" = ?',
+                                     (replacement_item, retired_item))
+            saveddata_engine.execute('UPDATE "cargo" SET "itemID" = ? WHERE "itemID" = ?',
+                                     (replacement_item, retired_item))

eos/db/migrations/upgrade5.py

@@ -0,0 +1,9 @@
+"""
+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

@@ -0,0 +1,11 @@
+"""
+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 (ID, name, emAmount, thermalAmount, kineticAmount, explosiveAmount, ownerID) VALUES (?, ?, ?, ?, ?, ?, ?)',
+                             (1, "Uniform", 25, 25, 25, 25, None))

eos/db/migrations/upgrade7.py

@@ -0,0 +1,23 @@
+"""
+Migration 7
+
+- Converts Scorpion Ishukone Watch to Scorpion
+
+    Mosaic introduced proper skinning system, and Ishukone Scorp
+    was the only ship which was presented as stand-alone ship in
+    Pyfa.
+"""
+
+CONVERSIONS = {
+    640: (  # Scorpion
+        4005,  # Scorpion Ishukone Watch
+    )
+}
+
+
+def upgrade(saveddata_engine):
+    # Convert ships
+    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))

eos/db/migrations/upgrade8.py

@@ -0,0 +1,85 @@
+"""
+Migration 8
+
+- Converts modules based on Carnyx Module Tiericide
+    Some modules have been unpublished (and unpublished module attributes are removed
+    from database), which causes pyfa to crash. We therefore replace these
+    modules with their new replacements
+"""
+
+CONVERSIONS = {
+    8529 : (  # Large F-S9 Regolith Compact Shield Extender
+        8409,  # Large Subordinate Screen Stabilizer I
+    ),
+    8419 : (  # Large Azeotropic Restrained Shield Extender
+        8489,  # Large Supplemental Barrier Emitter I
+    ),
+    8517 : (  # Medium F-S9 Regolith Compact Shield Extender
+        8397,  # Medium Subordinate Screen Stabilizer I
+    ),
+    8433 : (  # Medium Azeotropic Restrained Shield Extender
+        8477,  # Medium Supplemental Barrier Emitter I
+    ),
+    20627: (  # Small 'Trapper' Shield Extender
+        8437,  # Micro Azeotropic Ward Salubrity I
+        8505,  # Micro F-S9 Regolith Shield Induction
+        3849,  # Micro Shield Extender I
+        3851,  # Micro Shield Extender II
+        8387,  # Micro Subordinate Screen Stabilizer I
+        8465,  # Micro Supplemental Barrier Emitter I
+    ),
+    8521 : (  # Small F-S9 Regolith Compact Shield Extender
+        8401,  # Small Subordinate Screen Stabilizer I
+    ),
+    8427 : (  # Small Azeotropic Restrained Shield Extender
+        8481,  # Small Supplemental Barrier Emitter I
+    ),
+    11343: (  # 100mm Crystalline Carbonide Restrained Plates
+        11345,  # 100mm Reinforced Nanofiber Plates I
+    ),
+    11341: (  # 100mm Rolled Tungsten Compact Plates
+        11339,  # 100mm Reinforced Titanium Plates I
+    ),
+    11327: (  # 1600mm Crystalline Carbonide Restrained Plates
+        11329,  # 1600mm Reinforced Nanofiber Plates I
+    ),
+    11325: (  # 1600mm Rolled Tungsten Compact Plates
+        11323,  # 1600mm Reinforced Titanium Plates I
+    ),
+    11351: (  # 200mm Crystalline Carbonide Restrained Plates
+        11353,  # 200mm Reinforced Nanofiber Plates I
+    ),
+    11349: (  # 200mm Rolled Tungsten Compact Plates
+        11347,  # 200mm Reinforced Titanium Plates I
+    ),
+    11311: (  # 400mm Crystalline Carbonide Restrained Plates
+        11313,  # 400mm Reinforced Nanofiber Plates I
+    ),
+    11309: (  # 400mm Rolled Tungsten Compact Plates
+        11307,  # 400mm Reinforced Titanium Plates I
+    ),
+    23791: (  # 'Citadella' 100mm Steel Plates
+        11335,  # 50mm Reinforced Crystalline Carbonide Plates I
+        11337,  # 50mm Reinforced Nanofiber Plates I
+        11333,  # 50mm Reinforced Rolled Tungsten Plates I
+        11291,  # 50mm Reinforced Steel Plates I
+        20343,  # 50mm Reinforced Steel Plates II
+        11331,  # 50mm Reinforced Titanium Plates I
+    ),
+    11319: (  # 800mm Crystalline Carbonide Restrained Plates
+        11321,  # 800mm Reinforced Nanofiber Plates I
+    ),
+    11317: (  # 800mm Rolled Tungsten Compact Plates
+        11315,  # 800mm Reinforced Titanium Plates I
+    ),
+}
+
+
+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/upgrade9.py

@@ -0,0 +1,25 @@
+"""
+Migration 9
+
+Effectively drops UNIQUE constraint from boosters table. SQLite does not support
+this, so we have to copy the table to the updated schema and then rename it
+"""
+
+tmpTable = """
+CREATE TABLE boostersTemp (
+    'ID' INTEGER NOT NULL,
+    'itemID' INTEGER,
+    'fitID' INTEGER NOT NULL,
+    'active' BOOLEAN,
+    PRIMARY KEY(ID),
+    FOREIGN KEY('fitID') REFERENCES fits ('ID')
+)
+"""
+
+
+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("DROP TABLE boosters")
+    saveddata_engine.execute("ALTER TABLE boostersTemp RENAME TO boosters")

eos/db/saveddata/__init__.py

@@ -1,3 +1,17 @@
-__all__ = ["character", "fit", "module", "user", "skill", "price",
-           "booster", "drone", "implant", "fleet", "damagePattern",
-           "miscData", "targetResists"]
+__all__ = [
+    "character",
+    "fit",
+    "mutator",
+    "module",
+    "user",
+    "skill",
+    "price",
+    "booster",
+    "drone",
+    "implant",
+    "damagePattern",
+    "miscData",
+    "targetProfile",
+    "override",
+    "implantSet"
+]

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),
-                       UniqueConstraint("itemID", "fitID"))
-
-activeSideEffects_table = Table("boostersActiveSideEffects", saveddata_meta,
-                                Column("boosterID", ForeignKey("boosters.ID"), primary_key = True),
-                                Column("effectID", Integer, primary_key = True))
-
-class ActiveSideEffectsDummy(object):
-    def __init__(self, effectID):
-        self.effectID = effectID
+                       Column("created", DateTime, nullable=True, default=datetime.datetime.now),
+                       Column("modified", DateTime, nullable=True, onupdate=datetime.datetime.now),
+                       )
+
+
+booster_side_effect_table = Table("boosterSideEffects", saveddata_meta,
+                                  Column("boosterID", Integer, ForeignKey("boosters.ID"), primary_key=True, index=True),
+                                  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)