Include bin directory, add ffmpeg executable

MacOS builds seem to have a problem of not being able to access the ffmpeg that is outside their app location. So as a quick solution the executable will be copied into bin and the bin will be included in the build.

.github/workflows/macos_build.yml

@@ -9,6 +9,10 @@ jobs:
     runs-on: macos-latest
     steps:
       - uses: actions/checkout@v2
+      - uses: FedericoCarboni/setup-ffmpeg@v1
+        id: setup_ffmpeg
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
       - uses: actions-rs/toolchain@v1
         with:
           toolchain: stable
@@ -22,6 +26,7 @@ jobs:
       - name: Build Hydrus
         run: |
           cd $GITHUB_WORKSPACE
+          cp ${{ steps.setup_ffmpeg.outputs.ffmpeg-path }} bin/
           cp static/build_files/pyoxidizer.bzl pyoxidizer.bzl
           basename $(rustc --print sysroot) | sed -e "s/^stable-//" > triple.txt
           pyoxidizer build --release

static/build_files/macos_build.yml

@@ -9,6 +9,10 @@ jobs:
     runs-on: macos-latest
     steps:
       - uses: actions/checkout@v2
+      - uses: FedericoCarboni/setup-ffmpeg@v1
+        id: setup_ffmpeg
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
       - uses: actions-rs/toolchain@v1
         with:
           toolchain: stable
@@ -22,6 +26,7 @@ jobs:
       - name: Build Hydrus
         run: |
           cd $GITHUB_WORKSPACE
+          cp ${{ steps.setup_ffmpeg.outputs.ffmpeg-path }} bin/
           cp static/build_files/pyoxidizer.bzl pyoxidizer.bzl
           basename $(rustc --print sysroot) | sed -e "s/^stable-//" > triple.txt
           pyoxidizer build --release

static/build_files/pyoxidizer.bzl

@@ -34,7 +34,7 @@ def make_install(client, resources):
     files = FileManifest()
     files.add_python_resource(".", client)
 
-    static_resources = glob(["./*.py", "./*.md", "./*txt", "./static/**/*", "./help/**/*"], strip_prefix="{}/".format(CWD))
+    static_resources = glob(["./*.py", "./*.md", "./*txt", "./bin/**/*", "./static/**/*", "./help/**/*"], strip_prefix="{}/".format(CWD))
     files.add_manifest(static_resources)
      
     hydrus_source = glob(["./hydrus/**/*.py"], strip_prefix="{}/".format(CWD))