Get some things working for pyinstaller

config.py

@@ -86,9 +86,9 @@ def defPaths(customSavePath):
 
     __createDirs(savePath)
 
-    if isFrozen():
-        os.environ["REQUESTS_CA_BUNDLE"] = os.path.join(pyfaPath, "cacert.pem").encode('utf8')
-        os.environ["SSL_CERT_FILE"] = os.path.join(pyfaPath, "cacert.pem").encode('utf8')
+    #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")
@@ -109,6 +109,9 @@ def defPaths(customSavePath):
     eos.config.saveddata_connectionstring = "sqlite:///" + saveDB + "?check_same_thread=False"
     eos.config.gamedata_connectionstring = "sqlite:///" + gameDB + "?check_same_thread=False"
 
+    print(eos.config.saveddata_connectionstring)
+    print(eos.config.gamedata_connectionstring)
+
     # initialize the settings
     from service.settings import EOSSettings
     eos.config.settings = EOSSettings.getInstance().EOSSettings  # this is kind of confusing, but whatever

eos/db/migrations/__init__.py

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

eos/gamedata.py

@@ -525,7 +525,7 @@ class MarketGroup(EqBase):
     def __repr__(self):
         return "MarketGroup(ID={}, name={}, parent={}) at {}".format(
                 self.ID, self.name, getattr(self.parent, "name", None), self.name, hex(id(self))
-        ).encode('utf8')
+        )
 
 
 class MetaGroup(EqBase):

gui/pyfa_gauge.py

@@ -394,7 +394,7 @@ if __name__ == "__main__":
             yield x
             x += jump
 
-    class TestPanel(wx.Panel):
+    class MyPanel(wx.Panel):
         def __init__(self, parent, size=(500, 500)):
             wx.Panel.__init__(self, parent, size=size)
             box = wx.BoxSizer(wx.VERTICAL)
@@ -432,7 +432,7 @@ if __name__ == "__main__":
             wx.Frame.__init__(self, None, title=title, size=size)
             self.statusbar = self.CreateStatusBar()
             main_sizer = wx.BoxSizer(wx.VERTICAL)
-            panel = TestPanel(self, size=size)
+            panel = MyPanel(self, size=size)
             main_sizer.Add(panel)
             self.SetSizer(main_sizer)
 

pyfa.py

@@ -184,6 +184,7 @@ parser.add_option("-l", "--logginglevel", action="store", dest="logginglevel", h
 
 if __name__ == "__main__":
     # Configure paths
+    print ('starting')
     if options.rootsavedata is True:
         config.saveInRoot = True
 

pyfa.spec

@@ -0,0 +1,66 @@
+# -*- mode: python -*-
+
+import os
+from itertools import chain
+
+block_cipher = None
+
+added_files = [
+             ( 'imgs/gui/*.png', 'imgs/gui' ),
+             ( 'imgs/gui/*.gif', 'imgs/gui' ),
+             ( 'imgs/icons/*.png', 'imgs/icons' ),
+             ( 'imgs/renders/*.png', 'imgs/renders' ),
+             ( 'dist_assets/win/pyfa.ico', '.' ),
+             ( 'dist_assets/cacert.pem', '.' ),
+             ( 'eve.db', '.' ),
+             ( 'README.md', '.' ),
+             ( 'LICENSE', '.' ),
+             ]
+
+import_these = []
+
+# Walk directories that do dynamic importing
+paths = ('eos/effects', 'eos/db/migrations', 'service/conversions')
+for root, folders, files in chain.from_iterable(os.walk(path) for path in paths):
+    for file_ in files:
+        if file_.endswith(".py") and not file_.startswith("_"):
+            mod_name = "{}.{}".format(
+                root.replace("/", "."),
+                file_.split(".py")[0],
+            )
+            import_these.append(mod_name)
+
+a = Analysis([r'C:\Users\Ryan\Sync\Git\blitzmann\Pyfa\pyfa.py'],
+             pathex=[r'C:\Users\Ryan\Sync\Git\blitzmann\Pyfa'],
+             binaries=[],
+             datas=added_files,
+             hiddenimports=import_these,
+             hookspath=[],
+             runtime_hooks=[],
+             excludes=[],
+             win_no_prefer_redirects=False,
+             win_private_assemblies=False,
+             cipher=block_cipher)
+pyz = PYZ(a.pure, a.zipped_data,
+             cipher=block_cipher)
+exe = EXE(pyz,
+          a.scripts,
+          exclude_binaries=True,
+          debug=False,
+          console=True,
+          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',
+               )

service/conversions/__init__.py

@@ -9,6 +9,8 @@ elsewhere (in which case can be accessed with packs[name])
 
 import pkgutil
 
+
+
 # init parent dict
 all = {}
 
@@ -17,7 +19,32 @@ packs = {}
 
 
 prefix = __name__ + "."
-for importer, modname, ispkg in pkgutil.iter_modules(__path__, prefix):
+
+# load modules to work based with and without pyinstaller
+# from: https://github.com/webcomics/dosage/blob/master/dosagelib/loader.py
+# see: https://github.com/pyinstaller/pyinstaller/issues/1905
+
+# load modules using iter_modules()
+# (should find all filters in normal build, but not pyinstaller)
+module_names = [m[1] for m in pkgutil.iter_modules(__path__, prefix)]
+
+print ("module names from iter_modules: ", module_names)
+
+# special handling for PyInstaller
+importers = map(pkgutil.get_importer, __path__)
+toc = set()
+for i in importers:
+    if hasattr(i, 'toc'):
+        toc |= i.toc
+
+for elm in toc:
+    if elm.startswith(prefix):
+        module_names.append(elm)
+
+print("module names after get_importer toc: ", module_names)
+
+for modname in module_names:
+    print (modname)
     conversionPack = __import__(modname, fromlist="dummy")
     all.update(conversionPack.CONVERSIONS)
     modname_tail = modname.rsplit('.', 1)[-1]