Merge pull request #472 from iamnotturner/selenium-wire-hook

Selenium wire hook
timreibe · Jun 15, 2021 · eb2f22b · eb2f22b
2 parents 180d0f6 + a5c0f92
commit eb2f22b
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 8 deletions.
diff --git a/docs/distribution.md b/docs/distribution.md
@@ -56,22 +56,22 @@ Schritte zum Erstellen einer Distribution:
 
 .spec Datei erstellen und anschließend Distribution erstellen:  
 ```shell
-pyi-makespec main.py --specpath "specs//" --add-binary "..\tools\chromedriver\chromedriver-windows.exe;tools\chromedriver\" --name windows-terminservice --hidden-import plyer.platforms.win.notification --hidden-import cloudscraper --add-data "../tools/cloudscraper;./cloudscraper/" --icon "..images\spritze.ico"
+pyi-makespec main.py --specpath "specs//" --add-binary "..\tools\chromedriver\chromedriver-windows.exe;tools\chromedriver\" --name windows-terminservice --hidden-import plyer.platforms.win.notification --hidden-import cloudscraper --add-data "../tools/cloudscraper;./cloudscraper/" --icon "..\images\spritze.ico" --add-data "../version.txt;." --additional-hooks-dir "../tools/additional_hooks"
 
 pyinstaller --clean specs/windows-terminservice.spec
 ```
 #### Windows GUI
 
 ```shell
-pyi-makespec gui.py --specpath "specs//" --add-binary "..\tools\chromedriver\chromedriver-windows.exe;tools\chromedriver\" --add-binary "..\tools\gui\kontaktdaten.ui;tools\gui\" --add-binary "..\tools\gui\main.ui;tools\gui\" --add-binary "..\tools\gui\terminsuche.ui;tools\gui\" --add-binary "..\tools\gui\uhrzeiten.ui;tools\gui\" --add-binary "..\tools\gui\ui_qtcodegen.ui;tools\gui\" --add-binary "..\images\spritze.ico;images\" --name windows-terminservice-gui --hidden-import plyer.platforms.win.notification --hidden-import cloudscraper --add-data "../tools/cloudscraper;./cloudscraper/" --icon "..\images\spritze.ico" --windowed
+pyi-makespec gui.py --specpath "specs//" --add-binary "..\tools\chromedriver\chromedriver-windows.exe;tools\chromedriver\" --add-binary "..\tools\gui\kontaktdaten.ui;tools\gui\" --add-binary "..\tools\gui\main.ui;tools\gui\" --add-binary "..\tools\gui\terminsuche.ui;tools\gui\" --add-binary "..\tools\gui\impfzentren.ui;tools\gui\" --add-binary "..\tools\gui\ui_qtcodegen.ui;tools\gui\" --add-binary "..\images\spritze.ico;images\" --name windows-terminservice-gui --hidden-import plyer.platforms.win.notification --hidden-import cloudscraper --add-data "../tools/cloudscraper;./cloudscraper/" --icon "..\images\spritze.ico" --windowed --add-data "../version.txt;." --additional-hooks-dir "../tools/additional_hooks"
 
 pyinstaller --clean specs/windows-terminservice-gui.spec
 ```
 
 #### Linux
 ```shell 
-pyi-makespec main.py --specpath "specs//" --add-binary "../tools/chromedriver/chromedriver-linux-64:tools/chromedriver/" --name linux-64-terminservice --hidden-import cloudscraper --add-data "../tools/cloudscraper;./cloudscraper/" --icon "..images\spritze.ico"
-
+pyi-makespec main.py --specpath "specs//" --add-binary "../tools/chromedriver/chromedriver-linux-64:tools/chromedriver/" --name linux-64-terminservice --hidden-import cloudscraper --add-data "../tools/cloudscraper;./cloudscraper/" --icon "..images\spritze.ico" --add-data "../version.txt:." --additional-hooks-dir "../tools/additional_hooks"
+ 
 pyinstaller --clean specs/linux-64-terminservice.spec
 
 ```

diff --git a/specs/linux-64-terminservice.spec b/specs/linux-64-terminservice.spec
@@ -8,7 +8,7 @@ a = Analysis(['../main.py'],
              binaries=[('../tools/chromedriver/chromedriver-linux-64', 'tools/chromedriver/')],
              datas=[('../tools/cloudscraper', './cloudscraper/'), ('../version.txt', '.')],
              hiddenimports=['cloudscraper'],
-             hookspath=[],
+             hookspath=['../tools/additional_hooks'],
              runtime_hooks=[],
              excludes=[],
              win_no_prefer_redirects=False,

diff --git a/specs/windows-terminservice-gui.spec b/specs/windows-terminservice-gui.spec
@@ -9,7 +9,7 @@ a = Analysis(['..\\gui.py'],
              binaries=[('..\\tools\\chromedriver\\chromedriver-windows.exe', 'tools\\chromedriver\\'), ('..\\tools\\gui\\kontaktdaten.ui', 'tools\\gui\\'), ('..\\tools\\gui\\main.ui', 'tools\\gui\\'), ('..\\tools\\gui\\terminsuche.ui', 'tools\\gui\\'), ('..\\tools\\gui\\impfzentren.ui', 'tools\\gui\\'), ('..\\tools\\gui\\ui_qtcodegen.ui', 'tools\\gui\\'), ('..\\images\\spritze.ico', 'images\\')],
              datas=[('../tools/cloudscraper', './cloudscraper/'), ('../version.txt', '.')],
              hiddenimports=['plyer.platforms.win.notification', 'cloudscraper'],
-             hookspath=[],
+             hookspath=['../tools/additional_hooks'],
              runtime_hooks=[],
              excludes=[],
              win_no_prefer_redirects=False,

diff --git a/specs/windows-terminservice.spec b/specs/windows-terminservice.spec
@@ -1,5 +1,8 @@
 # -*- mode: python ; coding: utf-8 -*-
-
+"""
+IMPORTANT: 
+PLEASE UPDATE docs/distribution.md too! 
+"""
 
 block_cipher = None
 
@@ -9,7 +12,7 @@ a = Analysis(['..\\main.py'],
              binaries=[('..\\tools\\chromedriver\\chromedriver-windows.exe', 'tools\\chromedriver\\')],
              datas=[('../tools/cloudscraper', './cloudscraper/'), ('../version.txt', '.')],
              hiddenimports=['plyer.platforms.win.notification', 'cloudscraper'],
-             hookspath=[],
+             hookspath=['../tools/additional_hooks'],
              runtime_hooks=[],
              excludes=[],
              win_no_prefer_redirects=False,

diff --git a/tools/additional_hooks/hook-seleniumwire.py b/tools/additional_hooks/hook-seleniumwire.py
@@ -0,0 +1,11 @@
+"""
+This is a needed workaround for pyinstaller missing out on seleniumwire.
+
+GitHub issue comnment: https://github.com/wkeeling/selenium-wire/issues/84#issuecomment-624389859
+
+Pyinstaller docu: https://pyinstaller.readthedocs.io/en/stable/hooks.html#providing-pyinstaller-hooks-with-your-package
+"""
+
+from PyInstaller.utils.hooks import collect_data_files
+
+datas = collect_data_files('seleniumwire')