bundle: support macos (#675)

.github/workflows/macos-release.yml

@@ -0,0 +1,42 @@
+name: Release for macos
+on:
+  push:
+    tags:
+      - v*
+  workflow_dispatch:
+
+jobs:
+  build-n-publish:
+    runs-on: macos-latest
+    steps:
+    - uses: actions/checkout@master
+    - name: Set up Python
+      uses: actions/setup-python@v1
+      with:
+        python-version: "3.10"
+    - name: Build
+      run: |
+        python -m pip install --upgrade pip
+        pip install pyqt5
+        pip install pyinstaller
+        pip install -e .[macos,battery]
+    - name: Install libmpv
+      run: |
+        brew install mpv
+    - name: Archive
+      run: |
+        # List dist to help double check if bundle is ok.
+        ls dist/
+        cd dist/ && zip FeelUOwnX.zip -r FeelUOwnX.app/
+    - name: Upload artifact
+      uses: actions/upload-artifact@master
+      with:
+        name: FeelUOwnX.zip
+        path: dist/FeelUOwnX.app
+    - name: Upload to release page
+      if: startsWith(github.ref, 'refs/tags/v')
+      uses: softprops/action-gh-release@v1
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        files: dist/FeelUOwnX.zip

.github/workflows/win-release.yml

@@ -33,16 +33,16 @@ jobs:
       run: |
         # List dist to help double check if bundle is ok.
         ls dist/
-        powershell Compress-Archive dist/FeelUOwn dist/FeelUOwn-win64.zip
+        powershell Compress-Archive dist/FeelUOwn dist/FeelUOwn-windows.zip
     - name: Upload artifact
       uses: actions/upload-artifact@master
       with:
-        name: FeelUOwn-win64.zip
-        path: dist/FeelUOwn-win64.zip
+        name: FeelUOwn-windows.zip
+        path: dist/FeelUOwn
     - name: Upload to release page
       if: startsWith(github.ref, 'refs/tags/v')
       uses: softprops/action-gh-release@v1
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
-        files: dist/FeelUOwn-win64.zip
+        files: dist/FeelUOwn-windows.zip

.gitignore

@@ -6,6 +6,7 @@
 
 # pyinstaller
 /FeelUOwn.spec
+/FeelUOwnX.spec
 
 *.mp3
 

Makefile

@@ -53,18 +53,30 @@ integration_test:
 
 test: lint unittest
 
+BUNDLE_FLAGS=
+ifeq ($(OS),Windows_NT)
+	BUNDLE_FLAGS += --name FeelUOwn
+else
+# macOS: since apfs is not case-sensitive, we use FeelUOwnX instead of FeelUOwn
+	BUNDLE_FLAGS += --name FeelUOwnX --osx-bundle-identifier org.feeluown.FeelUOwnX
+endif
 # Please install pyinstaller manually.
 bundle:
 	pyinstaller -w feeluown/pyinstaller/main.py \
-		--icon feeluown/gui/assets/icons/feeluown.ico \
-		--name FeelUOwn \
+		--icon feeluown/gui/assets/icons/feeluown.icns \
+		${BUNDLE_FLAGS} \
 		-w \
 		--noconfirm
 
-clean:
-	find . -name "*~" -exec rm -f {} \;
+clean: clean_py clean_emacs
+
+clean_py:
 	find . -name "*.pyc" -exec rm -f {} \;
+	find . -name __pycache__ -delete
+	find . -name .mypy_cache/ -delete
+
+clean_emacs:
+	find . -name "*~" -exec rm -f {} \;
 	find . -name "*flymake.py" -exec rm -f {} \;
 	find . -name "\#*.py\#" -exec rm -f {} \;
 	find . -name ".\#*.py\#" -exec rm -f {} \;
-	find . -name __pycache__ -delete

feeluown/pyinstaller/main.py

@@ -1,5 +1,10 @@
+import sys
+import os
 import feeluown.__main__
 
 
 if __name__ == '__main__':
+    if hasattr(sys, '_MEIPASS'):
+        os.chdir(sys._MEIPASS)
+
     feeluown.__main__.main()

pyinstaller_hooks/hook-feeluown.py

@@ -1,21 +1,34 @@
 import os
+import sys
 import ctypes
 from PyInstaller.utils.hooks import collect_data_files, collect_entry_point
 
 
+assets_files = [
+    '**/*.png',
+    '**/*.qss',
+    '**/*.svg',
+    '**/*.ico',
+    '**/*.icns',
+    '**/*.colors'
+]
 datas, hiddenimports = collect_entry_point('fuo.plugins_v1')
 
 # aionowplaying is conditionally imported.
 if os.name == 'nt':
     hiddenimports.append('aionowplaying')
     # pyinstaller can't detect 'aionowplaying.interface.windows' is imported.
     hiddenimports.append('aionowplaying.interface.windows')
+if sys.platform == 'darwin':
+    hiddenimports.append('aionowplaying.interface.macos')
+    hiddenimports.append('feeluown.aionowplaying.macos')
 
 # Collect feeluown's resource files, like icons, qss files, etc.
 # Collect plugins' resource files.
-datas += collect_data_files('feeluown')
+datas += collect_data_files('feeluown', includes=assets_files)
 for pkg in hiddenimports:
-    datas += collect_data_files(pkg)
+    datas += collect_data_files(pkg, includes=assets_files)
+
 
 # Collect mpv dynamic-link library.
 if os.name == 'nt':