organized files, changed @TK50P link to his website, fixed imports for

linux

Author: daveberrys

.github/workflows/building.yml

@@ -37,26 +37,24 @@ jobs:
               with:
                 python-version: ${{ env.pythonVersion }}
 
-            - name: Install Qt dependencies (Linux)
+            - name: Install Qt system dependencies (Linux)
               if: runner.os == 'Linux'
               run: |
                 sudo apt update
                 sudo apt install -y python3-pip python3-venv xvfb libxcb-cursor0 libxcb-xinerama0 libxkbcommon-x11-0
-                
-            - name: Install Python dependencies (Linux/MacOS)
-              if: runner.os != 'Windows'
-              run: |
-                python -m pip install --upgrade pip
-                pip install -r requirements.txt
             
-            - name: Install Python dependencies (Windows)
-              if: runner.os == 'Windows'
+            - name: Install Python dependencies (Windows/MacOS)
+              if: runner.os != "Linux"
               run: |
                 python -m pip install --upgrade pip
-                pip install -r requirements.txt
-
+                pip install -r python/requirements.txt
+                
+            - name: Install Python dependencies (Linux)
+              if: runner.os == 'Linux'
+              run: pip install -r python/requirements-linux.txt
+            
             - name: Compile with PyInstaller
-              run: pyinstaller WhatsAnApp.spec
+              run: pyinstaller python/WhatsAnApp.spec
 
             - name: Rename Build (Windows)
               if: runner.os == 'Windows'

README.md

@@ -55,7 +55,7 @@ venv/bin/pip install -r requirements.txt
 venv/bin/python main.py
 ```
 <details>
-    <summary>Screenshot Preview (By [Daveberry](https://daveberry.netlify.app/))</summary>
+    <summary>Screenshot Preview (By Daveberry)</summary>
     <img src="readme/Linux (Daveberry).png"/>
 </details>
 
@@ -74,7 +74,7 @@ venv\Scripts\python main.py
     <p>No one yet. Maybe you could help?</p>
 </details>
 
-In MacOS, here are the steps: (Confirmed by [@TK50P](https://github.com/tk50p))
+In MacOS, here are the steps: (Confirmed by [@TK50P](https://www.tk50piscool.kro.kr/))
 ```bash
 git clone https://github.com/daveberrys/WhatsAnApp/
 cd WhatsAnApp

WhatsAnApp.spec python/WhatsAnApp.specWhatsAnApp.spec renamed to python/WhatsAnApp.spec

@@ -11,17 +11,27 @@ if sys.platform == "win32":
 else:
     icon_file = "assets/WhatsAnApp.png"
 
+if sys.platform == "linux":
+    hidimports = [
+        'pywebview',
+        'flask',
+        'qtpy',
+        'PyQT5',
+        'PyQT5.QtWebEngineWidgets'
+    ]
+else:
+    hidimports = [
+        'pywebview',
+        'flask'
+    ]
+    
 a = Analysis(
     ['main.py'],
     pathex=[],
     binaries=binaries_wv,
     datas=[('assets', 'assets')] + datas_wv,
     hiddenimports=[
-        'pywebview', 
-        'flask', 
-        'qtpy', 
-        'PyQt5',
-        'PyQt5.QtWebEngineWidgets'
+        hidimports
     ] + hiddenimports_wv,
     hookspath=[],
     hooksconfig={},

requirements.txt python/requirements-linux.txtrequirements.txt renamed to python/requirements-linux.txt

@@ -1,5 +1,6 @@
 flask
 pywebview
-PyQt5
 pyinstaller
+PyQT5
 PyQtWebEngine
+qtpy

python/requirements.txt

@@ -0,0 +1,3 @@
+flask
+pywebview
+pyinstaller