Merge branch 'master' into ammo_graph

service/conversions/trigDread.py

@@ -0,0 +1,11 @@
+"""
+In October 2019 we released triglavian dread preview builds, we had custom names for
+ship itself and its gun. Here we make sure that legacy names are converted into proper ones.
+"""
+
+CONVERSIONS = {
+    'Triglavian Dreadnought': 'Zirnitra',
+    'PLACEHOLDER TRIG DREAD': 'Zirnitra',
+    'XL Entropic Disintegrator': 'Ultratidal Entropic Disintegrator I',
+    'PLACEHOLDER TRIG XL WEAPON': 'Ultratidal Entropic Disintegrator I'
+}

service/damagePattern.py

@@ -17,6 +17,7 @@
 # along with pyfa.  If not, see <http://www.gnu.org/licenses/>.
 # =============================================================================
 
+
 import copy
 
 import eos.db
@@ -38,9 +39,13 @@ class DamagePattern:
         return cls.instance
 
     @staticmethod
-    def getDamagePatternList():
+    def getUserDamagePatternList():
         return eos.db.getDamagePatternList()
 
+    @staticmethod
+    def getBuiltinDamagePatternList():
+        return es_DamagePattern.getBuiltinList()
+
     @staticmethod
     def getDamagePattern(name):
         return eos.db.getDamagePattern(name)
@@ -81,7 +86,7 @@ class DamagePattern:
             raise ImportError("%d patterns imported from clipboard; %d had errors" % (num, num - lenImports))
 
     def exportPatterns(self):
-        patterns = self.getDamagePatternList()
+        patterns = self.getUserDamagePatternList()
         for i in range(len(patterns) - 1, -1, -1):
             if patterns[i].name in ("Uniform", "Selected Ammo"):
                 del patterns[i]

service/port/eft.py

@@ -864,7 +864,6 @@ class AbstractFit:
         self.cargo[itemSpec.item].amount += itemSpec.amount
 
 
-
 def _lineIter(text):
     """Iterate over non-blank lines."""
     for line in text.splitlines():

service/prefetch.py

@@ -22,7 +22,6 @@ import os
 import config
 from eos import db
 from eos.db import migration
-from eos.db.saveddata.loadDefaultDatabaseValues import DefaultDatabaseValues
 from eos.db.saveddata.databaseRepair import DatabaseCleanup
 
 from logbook import Logger
@@ -38,10 +37,6 @@ if config.saveDB and os.path.isfile(config.saveDB):
     pyfalog.debug("Run database migration.")
     db.saveddata_meta.create_all()
     migration.update(db.saveddata_engine)
-    # Import default database values
-    # Import values that must exist otherwise Pyfa breaks
-    pyfalog.debug("Import Required Database Values.")
-    DefaultDatabaseValues.importRequiredDefaults()
 
     # Finds and fixes database corruption issues.
     pyfalog.debug("Starting database validation.")
@@ -62,10 +57,3 @@ else:
     pyfalog.debug("Existing database not found, creating new database.")
     db.saveddata_meta.create_all()
     db.saveddata_engine.execute('PRAGMA user_version = {}'.format(migration.getAppVersion()))
-    # Import default database values
-    # Import values that must exist otherwise Pyfa breaks
-    DefaultDatabaseValues.importRequiredDefaults()
-    # Import default values for damage profiles
-    DefaultDatabaseValues.importDamageProfileDefaults()
-    # Import default values for target resist profiles
-    DefaultDatabaseValues.importTargetProfileDefaults()

service/targetProfile.py

@@ -38,12 +38,12 @@ class TargetProfile:
         return cls.instance
 
     @staticmethod
-    def getTargetProfileList():
+    def getUserTargetProfileList():
         return db.getTargetProfileList()
 
     @staticmethod
-    def getTargetProfile(name):
-        return db.getTargetProfile(name)
+    def getBuiltinTargetProfileList():
+        return es_TargetProfile.getBuiltinList()
 
     @staticmethod
     def newPattern(name):
@@ -81,6 +81,6 @@ class TargetProfile:
             raise ImportError("%d patterns imported from clipboard; %d had errors" % (num, num - lenImports))
 
     def exportPatterns(self):
-        patterns = self.getTargetProfileList()
+        patterns = self.getUserTargetProfileList()
         patterns.sort(key=lambda p: p.name)
         return es_TargetProfile.exportPatterns(*patterns)