Move database out of shortcircuit.resources.database

I don't even know how to build packages anymore.
`--paths` just doesn't work (but `PYTHONPATH` does).
`--collect-data` from submodules works, but packaging then fails
due to absense of subfolders (i.e. `--collect-data shortcircuit.resources.database`).

.gitignore

@@ -184,6 +184,6 @@ $RECYCLE.BIN/
 
 ### Custom
 .idea
-src/shortcircuit/resources/database/universeDataDx.db
+src/database/universeDataDx.db
 shortcircuit.log*
 .DS_Store

build_mac_installer.sh

@@ -3,7 +3,9 @@
 python -O -m PyInstaller \
     --clean \
     --windowed \
-    --icon src/shortcircuit/resources/images/app_icon.icns \
+    --icon resources/images/app_icon.icns \
+    --add-data 'src/database:.' \
+    --noconfirm \
     --name shortcircuit src/main.py \
     --noupx \
     --osx-bundle-identifier ru.secondfry.shortcircuit

build_win_installer.bat

@@ -1,7 +1,9 @@
 python -O -m PyInstaller ^
     --clean ^
     --windowed ^
-    --icon src\shortcircuit\resources\images\app_icon.ico ^
+    --icon resources\images\app_icon.ico ^
+    --add-data 'src\database:.' ^
+    --noconfirm ^
     --name shortcircuit src\main.py ^
     --onefile ^
     --paths "build\libs" ^

generate_gui.bat

@@ -1,4 +1,4 @@
-pyside2-uic --from-imports src\shortcircuit\resources\ui\gui_main.ui -o src\shortcircuit\view\gui_main.py
-pyside2-uic --from-imports src\shortcircuit\resources\ui\gui_tripwire.ui -o src\shortcircuit\view\gui_tripwire.py
-pyside2-uic --from-imports src\shortcircuit\resources\ui\gui_about.ui -o src\shortcircuit\view\gui_about.py
-pyside2-rcc src\shortcircuit\resources\resources.qrc -o src\shortcircuit\view\resources_rc.py
+pyside2-uic --from-imports resources\ui\gui_main.ui -o src\shortcircuit\view\gui_main.py
+pyside2-uic --from-imports resources\ui\gui_tripwire.ui -o src\shortcircuit\view\gui_tripwire.py
+pyside2-uic --from-imports resources\ui\gui_about.ui -o src\shortcircuit\view\gui_about.py
+pyside2-rcc resources\resources.qrc -o src\shortcircuit\view\resources_rc.py

generate_gui.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-pyside2-uic --from-imports src/shortcircuit/resources/ui/gui_main.ui -o src/shortcircuit/view/gui_main.py
-pyside2-uic --from-imports src/shortcircuit/resources/ui/gui_tripwire.ui -o src/shortcircuit/view/gui_tripwire.py
-pyside2-uic --from-imports src/shortcircuit/resources/ui/gui_about.ui -o src/shortcircuit/view/gui_about.py
-pyside2-rcc src/shortcircuit/resources/resources.qrc -o src/shortcircuit/view/resources_rc.py
+pyside2-uic --from-imports resources/ui/gui_main.ui -o src/shortcircuit/view/gui_main.py
+pyside2-uic --from-imports resources/ui/gui_tripwire.ui -o src/shortcircuit/view/gui_tripwire.py
+pyside2-uic --from-imports resources/ui/gui_about.ui -o src/shortcircuit/view/gui_about.py
+pyside2-rcc resources/resources.qrc -o src/shortcircuit/view/resources_rc.py

shortcircuit.spec

@@ -8,7 +8,7 @@ a = Analysis(
     ['src/main.py'],
     pathex=[],
     binaries=[],
-    datas=[ ('src/shortcircuit/resources', 'shortcircuit/resources') ],
+    datas=[('src/database', '.')],
     hiddenimports=[],
     hookspath=[],
     hooksconfig={},
@@ -37,7 +37,7 @@ exe = EXE(
     target_arch=None,
     codesign_identity=None,
     entitlements_file=None,
-    icon='src/shortcircuit/resources/images/app_icon.icns',
+    icon='resources/images/app_icon.icns',
 )
 coll = COLLECT(
     exe,
@@ -52,6 +52,6 @@ coll = COLLECT(
 app = BUNDLE(
     coll,
     name='shortcircuit.app',
-    icon='src/shortcircuit/resources/images/app_icon.icns',
+    icon='resources/images/app_icon.icns',
     bundle_identifier='ru.secondfry.shortcircuit',
 )

src/db_create.py

@@ -13,7 +13,7 @@ def main():
   Place "universeDataDx.db" in the database resource directory for this script to run
   :return:
   """
-  db_dir = os.path.join("shortcircuit", "resources", "database")
+  db_dir = os.path.join("database")
   eve_db_file = os.path.join(db_dir, "universeDataDx.db")
   system_jumps_file = os.path.join(db_dir, "system_jumps.csv")
   system_description_file = os.path.join(db_dir, "system_description.csv")

src/shortcircuit/model/evedb.py

@@ -12,7 +12,7 @@
 
 
 def get_dict_from_csv(filename: str):
-  file = files('shortcircuit.resources.database').joinpath(filename)
+  file = files('database').joinpath(filename)
   data = file.read_text()
   reader = csv.reader(StringIO(data), delimiter=';')