One Click Packaging

.gitignore

@@ -49,7 +49,6 @@ Pyfa.egg-info/
 #  Usually these files are written by a python script from a template
 #  before PyInstaller builds the exe, so as to inject date/other infos into it.
 *.manifest
-*.spec
 
 # Installer logs
 pip-log.txt

config.py

@@ -1,15 +1,14 @@
 import os
 import sys
 
-# TODO: move all logging back to pyfa.py main loop
-# We moved it here just to avoid rebuilding windows skeleton for now (any change to pyfa.py needs it)
-import logging
-import logging.handlers
+from logbook import Logger
+logger = Logger(__name__)
 
 # Load variable overrides specific to distribution type
 try:
     import configforced
 except ImportError:
+    logger.warning("Failed to import: configforced")
     configforced = None
 
 # Turns on debug mode
@@ -29,23 +28,6 @@
 saveDB = None
 gameDB = None
 
-
-class StreamToLogger(object):
-    """
-    Fake file-like stream object that redirects writes to a logger instance.
-    From: http://www.electricmonk.nl/log/2011/08/14/redirect-stdout-and-stderr-to-a-logger-in-python/
-    """
-
-    def __init__(self, logger, log_level=logging.INFO):
-        self.logger = logger
-        self.log_level = log_level
-        self.linebuf = ''
-
-    def write(self, buf):
-        for line in buf.rstrip().splitlines():
-            self.logger.log(self.log_level, line.rstrip())
-
-
 def isFrozen():
     if hasattr(sys, 'frozen'):
         return True
@@ -66,10 +48,7 @@ def defPaths(customSavePath):
     global gameDB
     global saveInRoot
 
-    if debug:
-        logLevel = logging.DEBUG
-    else:
-        logLevel = logging.WARN
+    logger.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
@@ -97,25 +76,6 @@ def defPaths(customSavePath):
         os.environ["REQUESTS_CA_BUNDLE"] = getPyfaPath(certName).encode('utf8')
         os.environ["SSL_CERT_FILE"] = getPyfaPath(certName).encode('utf8')
 
-    loggingFormat = '%(asctime)s %(name)-24s %(levelname)-8s %(message)s'
-    logging.basicConfig(format=loggingFormat, level=logLevel)
-    handler = logging.handlers.RotatingFileHandler(getSavePath("log.txt"), maxBytes=1000000, backupCount=3)
-    formatter = logging.Formatter(loggingFormat)
-    handler.setFormatter(formatter)
-    logging.getLogger('').addHandler(handler)
-
-    logging.info("Starting pyfa")
-
-    if hasattr(sys, 'frozen'):
-        stdout_logger = logging.getLogger('STDOUT')
-        sl = StreamToLogger(stdout_logger, logging.INFO)
-        sys.stdout = sl
-
-        # This interferes with cx_Freeze's own handling of exceptions. Find a way to fix this.
-        # stderr_logger = logging.getLogger('STDERR')
-        # sl = StreamToLogger(stderr_logger, logging.ERROR)
-        # sys.stderr = sl
-
     # The database where we store all the fits etc
     saveDB = getSavePath("saveddata.db")
 
@@ -135,7 +95,7 @@ def defPaths(customSavePath):
 
 
 def getPyfaPath(Append=None):
-    base = getattr(sys.modules['__main__'], "__file__", sys.executable) if isFrozen() else sys.argv[0]
+    base = sys.argv[0]
     root = os.path.dirname(os.path.realpath(os.path.abspath(base)))
 
     if Append:

eos/__init__.py

@@ -1,8 +1,9 @@
-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"
+
+'''
+def test():
+    import tests.runTests
+    import unittest
+    unittest.main(defaultTest="discover", testLoader=tests.runTests.loader)
+'''

eos/config.py

@@ -5,11 +5,13 @@
 gamedataCache = True
 saveddataCache = True
 gamedata_version = ""
+# TODO: Removed this as it's already specified in config.py
+'''
 gamedata_connectionstring = 'sqlite:///' + unicode(realpath(join(dirname(abspath(__file__)), "..", "eve.db")),
                                                    sys.getfilesystemencoding())
 saveddata_connectionstring = 'sqlite:///' + unicode(
     realpath(join(dirname(abspath(__file__)), "..", "saveddata", "saveddata.db")), sys.getfilesystemencoding())
-
+'''
 
 # Autodetect path, only change if the autodetection bugs out.
 path = dirname(unicode(__file__, sys.getfilesystemencoding()))

eos/db/__init__.py

@@ -23,7 +23,10 @@
 from sqlalchemy.orm import sessionmaker, scoped_session
 from sqlalchemy.ext.declarative import declarative_base
 from sqlalchemy import pool
+from logbook import Logger
 
+logger = Logger(__name__)
+logger.debug("Initializing")
 
 import migration
 from eos import config
@@ -50,6 +53,7 @@ class ReadOnlyException(Exception):
         "SELECT `field_value` FROM `metadata` WHERE `field_name` LIKE 'client_build'"
     ).fetchone()[0]
 except:
+    logger.warning("Missing gamedata version.")
     config.gamedata_version = None
 
 saveddata_connectionstring = config.saveddata_connectionstring
@@ -67,8 +71,9 @@ class ReadOnlyException(Exception):
 sd_lock = threading.Lock()
 
 # Import all the definitions for all our database stuff
-from eos.db.gamedata import *
-from eos.db.saveddata import *
+#from eos.db.gamedata import *
+from eos.db.gamedata import alphaClones, attribute, category, effect, group, icon, item, marketGroup, metaData, metaGroup, queries, traits, unit
+from eos.db.saveddata import booster, cargo, character, crest, damagePattern, databaseRepair, drone, fighter, fit, implant, implantSet, loadDefaultDatabaseValues, miscData, module, override, price, queries, skill, targetResists, user
 
 # Import queries
 from eos.db.gamedata.queries import *

eos/db/migration.py

@@ -1,12 +1,12 @@
-import logging
+from logbook import Logger
+logger = Logger(__name__)
+
 import shutil
 import time
 
 import config
 import migrations
 
-logger = logging.getLogger(__name__)
-
 
 def getVersion(db):
     cursor = db.execute('PRAGMA user_version')
@@ -37,7 +37,7 @@ def update(saveddata_engine):
         for version in xrange(dbVersion, appVersion):
             func = migrations.updates[version + 1]
             if func:
-                logger.info("Applying database update: %d", version + 1)
+                logger.info("Applying database update: {0}", version + 1)
                 func(saveddata_engine)
 
         # when all is said and done, set version to current

eos/db/saveddata/databaseRepair.py

@@ -18,9 +18,8 @@
 # ===============================================================================
 
 import sqlalchemy
-import logging
-
-logger = logging.getLogger(__name__)
+from logbook import Logger
+logger = Logger(__name__)
 
 
 class DatabaseCleanup:
@@ -43,7 +42,7 @@ def OrphanedCharacterSkills(saveddata_engine):
 
             if row and row['num']:
                 delete = saveddata_engine.execute("DELETE FROM characterSkills WHERE characterID NOT IN (SELECT ID from characters)")
-                logger.error("Database corruption found. Cleaning up %d records.", delete.rowcount)
+                logger.error("Database corruption found. Cleaning up {0} records.", delete.rowcount)
 
         except sqlalchemy.exc.DatabaseError:
             logger.error("Failed to connect to database.")
@@ -73,7 +72,7 @@ def OrphanedFitDamagePatterns(saveddata_engine):
                     update = saveddata_engine.execute("UPDATE 'fits' SET 'damagePatternID' = ? "
                                                       "WHERE damagePatternID NOT IN (SELECT ID FROM damagePatterns) OR damagePatternID IS NULL",
                                                        uniform_damage_pattern_id)
-                    logger.error("Database corruption found. Cleaning up %d records.", update.rowcount)
+                    logger.error("Database corruption found. Cleaning up {0} records.", update.rowcount)
         except sqlalchemy.exc.DatabaseError:
             logger.error("Failed to connect to database.")
 
@@ -99,6 +98,6 @@ def OrphanedFitCharacterIDs(saveddata_engine):
                     update = saveddata_engine.execute("UPDATE 'fits' SET 'characterID' = ? "
                                                       "WHERE characterID not in (select ID from characters) OR characterID IS NULL",
                                                        all5_id)
-                    logger.error("Database corruption found. Cleaning up %d records.", update.rowcount)
+                    logger.error("Database corruption found. Cleaning up {0} records.", update.rowcount)
         except sqlalchemy.exc.DatabaseError:
             logger.error("Failed to connect to database.")

eos/effectHandlerHelpers.py

@@ -18,12 +18,11 @@
 # ===============================================================================
 
 # from sqlalchemy.orm.attributes import flag_modified
-import logging
+from logbook import Logger
+logger = Logger(__name__)
 
 import eos.db
 
-logger = logging.getLogger(__name__)
-
 
 class HandledList(list):
     def filteredItemPreAssign(self, filter, *args, **kwargs):

eos/effects/__init__.py

@@ -1,19 +0,0 @@
-# ===============================================================================
-# Copyright (C) 2010 Diego Duclos
-#               2010 Anton Vorobyov
-#
-# This file, as well as all files in this folder, are 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/>.
-# ===============================================================================

eos/effects/adaptivearmorhardener.py

@@ -2,9 +2,8 @@
 #
 # Used by:
 # Module: Reactive Armor Hardener
-import logging
-
-logger = logging.getLogger(__name__)
+from logbook import Logger
+logger = Logger(__name__)
 
 runTime = "late"
 type = "active"
@@ -98,7 +97,7 @@ def handler(fit, module, context):
             cycleList.append(list(RAHResistance))
 
         if loopStart < 0:
-            logger.error("Reactive Armor Hardener failed to find equilibrium. Damage profile after armor: %f/%f/%f/%f",
+            logger.error("Reactive Armor Hardener failed to find equilibrium. Damage profile after armor: {0}/{1}/{2}/{3}",
                          baseDamageTaken[0], baseDamageTaken[1], baseDamageTaken[2], baseDamageTaken[3])
 
         # Average the profiles in the RAH loop, or the last 20 if it didn't find a loop.

eos/gamedata.py

@@ -30,6 +30,9 @@
 except ImportError:
     from utils.compat import OrderedDict
 
+from logbook import Logger
+logger = Logger(__name__)
+
 
 class Effect(EqBase):
     """
@@ -64,6 +67,8 @@ def handler(self):
         if not self.__generated:
             self.__generateHandler()
 
+        logger.debug("Generating effect: {0} ({1}) [runTime: {2}]", self.name, self.effectID, self.runTime)
+
         return self.__handler
 
     @property
@@ -138,7 +143,7 @@ def type(self):
     @property
     def isImplemented(self):
         """
-        Wether this effect is implemented in code or not,
+        Whether this effect is implemented in code or not,
         unimplemented effects simply do nothing at all when run
         """
         return self.handler != effectDummy

eos/graph/fitDps.py

@@ -22,6 +22,9 @@
 from eos.graph import Graph
 from eos.types import Hardpoint, State
 
+from logbook import Logger
+logger = Logger(__name__)
+
 
 class FitDpsGraph(Graph):
     defaults = {"angle": 0,
@@ -66,6 +69,7 @@ def calcDps(self, data):
                     val *= 1 + (bonus - 1) * exp(- i ** 2 / 7.1289)
                 data[attr] = val
             except:
+                logger.warning("Caught exception in calcDPS.")
                 pass
 
         for mod in fit.modules:

eos/saveddata/booster.py

@@ -17,16 +17,15 @@
 # along with eos.  If not, see <http://www.gnu.org/licenses/>.
 # ===============================================================================
 
-import logging
+from logbook import Logger
+logger = Logger(__name__)
 
 from sqlalchemy.orm import reconstructor, validates
 
 import eos.db
 from eos.effectHandlerHelpers import HandledItem
 from eos.modifiedAttributeDict import ModifiedAttributeDict, ItemAttrShortcut
 
-logger = logging.getLogger(__name__)
-
 
 class Booster(HandledItem, ItemAttrShortcut):
     def __init__(self, item):
@@ -47,11 +46,11 @@ def init(self):
         if self.itemID:
             self.__item = eos.db.getItem(self.itemID)
             if self.__item is None:
-                logger.error("Item (id: %d) does not exist", self.itemID)
+                logger.error("Item (id: {0}) does not exist", self.itemID)
                 return
 
         if self.isInvalid:
-            logger.error("Item (id: %d) is not a Booser", self.itemID)
+            logger.error("Item (id: {0}) is not a Booser", self.itemID)
             return
 
         self.build()

eos/saveddata/cargo.py

@@ -17,16 +17,15 @@
 # along with eos.  If not, see <http://www.gnu.org/licenses/>.
 # ===============================================================================
 
-import logging
+from logbook import Logger
+logger = Logger(__name__)
 
 from sqlalchemy.orm import validates, reconstructor
 
 import eos.db
 from eos.effectHandlerHelpers import HandledItem
 from eos.modifiedAttributeDict import ModifiedAttributeDict, ItemAttrShortcut
 
-logger = logging.getLogger(__name__)
-
 
 class Cargo(HandledItem, ItemAttrShortcut):
     def __init__(self, item):
@@ -46,7 +45,7 @@ def init(self):
         if self.itemID:
             self.__item = eos.db.getItem(self.itemID)
             if self.__item is None:
-                logger.error("Item (id: %d) does not exist", self.itemID)
+                logger.error("Item (id: {0}) does not exist", self.itemID)
                 return
 
         self.__itemModifiedAttributes = ModifiedAttributeDict()