Merge pull request #32 from bransoned/28-bug-macos-and-linux-builds-not-able-to-reference-exiftools

#28 Add exiftool installation instructions to README
Change the way Linux and MacOS builds are created. Update readme information to reflect this

Author: bransoned

.github/workflows/python-package.yml

@@ -19,11 +19,11 @@ jobs:
 
   # Test on multiple Python versions (Linux)
   test:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.9", "3.10", "3.11"]
+        python-version: ["3.10", "3.11", "3.12"]
     steps:
     - uses: actions/checkout@v4
     - name: Set up Python ${{ matrix.python-version }}
@@ -52,7 +52,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [windows-latest, ubuntu-latest, macos-latest]
+        os: [windows-latest, ubuntu-22.04, macos-latest, macos-15-intel]
 
     runs-on: ${{ matrix.os }}
 
@@ -71,49 +71,43 @@ jobs:
         if: runner.os == 'Linux'
         run: |
           sudo apt-get update
-          sudo apt-get install -y ffmpeg exiftool
+          sudo apt-get install -y ffmpeg
 
-      - name: Collect ffmpeg & exiftool (Linux)
+      - name: Collect ffmpeg (Linux)
         if: runner.os == 'Linux'
         run: |
           mkdir -p bin
           FFMPEG_PATH=$(which ffmpeg)
-          EXIFTOOL_PATH=$(which exiftool)
       
           echo "ffmpeg: $FFMPEG_PATH"
-          echo "exiftool: $EXIFTOOL_PATH"
 
           cp "$FFMPEG_PATH" bin/ffmpeg
-          cp "$EXIFTOOL_PATH" bin/exiftool
 
-          chmod +x bin/ffmpeg bin/exiftool
+          chmod +x bin/ffmpeg
 
       - name: Install system deps (macOS)
         if: runner.os == 'macOS'
         run: |
-          brew install ffmpeg exiftool
+          brew install ffmpeg
   
-      - name: Collect ffmpeg & exiftool (macOS)
+      - name: Collect ffmpeg (macOS)
         if: runner.os == 'macOS'
         shell: bash
         run: |
           mkdir -p bin
           FFMPEG_PATH=$(which ffmpeg)
-          EXIFTOOL_PATH=$(which exiftool)
-      
+          
           echo "ffmpeg: $FFMPEG_PATH"
-          echo "exiftool: $EXIFTOOL_PATH"
-      
+          
           cp "$FFMPEG_PATH" bin/ffmpeg
-          cp "$EXIFTOOL_PATH" bin/exiftool
-      
-          chmod +x bin/ffmpeg bin/exiftool
+          
+          chmod +x bin/ffmpeg
           
       - name: Download ExifTool (Windows)
         if: runner.os == 'Windows'
         shell: pwsh
         run: |
-          curl -L https://exiftool.org/exiftool-13.43_64.zip -o exiftool.zip
+          curl -L https://sourceforge.net/projects/exiftool/files/exiftool-13.43_64.zip/download -o exiftool.zip
           mkdir bin
           Expand-Archive exiftool.zip exiftool_temp -Force
           $inner = Get-ChildItem exiftool_temp -Directory | Select-Object -First 1
@@ -160,8 +154,7 @@ jobs:
                 --add-data bin/exiftool_files;bin/exiftool_files"
             else
               BIN_ARGS="\
-                --add-binary bin/ffmpeg:bin \
-                --add-binary bin/exiftool:bin"
+                --add-binary bin/ffmpeg:bin"
             fi
 
             pyinstaller $COMMON_ARGS $BIN_ARGS script.py
@@ -179,11 +172,12 @@ jobs:
       - name: Upload artifact
         uses: actions/upload-artifact@v4
         with:
-          name: MemorEasy-${{ runner.os }}
+          name: MemorEasy-${{ runner.os }}-${{ runner.arch }}
           path: dist/*
 
       - name: Upload binaries to GitHub Release
         if: startsWith(github.ref, 'refs/tags/')
         uses: softprops/action-gh-release@v1
         with:
+          name: MemorEasy-${{ runner.os }}-${{ runner.arch }}
           files: dist/*

README.md

@@ -135,20 +135,24 @@ TODO Add built with images
       your first time exporting Memories and/or running this script.
     - Lastly, when delivered the zip file from Snapchat with your data, unzip and find the `memories_history.html` file. MemorEasy will parse this file
       for all of the information needed to import your Memories.
-    - TODO Add images or a GIF showing process of selecting data.
+    - TODO Add images or a GIF showing process of selecting data.  
 <!--2. Confirm that [Python](https://www.python.org/downloads/) is installed on your system.-->
 
 ### Quick Start (Recommended)
 ... Especially for Windows users
 
 1. Download the pre-built executable for your platform from the latest release
-   - [Windows](https://github.com/bransoned/MemorEasy/releases/latest/download/MemorEasy.exe)
-   - [Linux](https://github.com/bransoned/MemorEasy/releases/latest/download/MemorEasy-Linux) (built on ubuntu-latest)
-   - [macOS](https://github.com/bransoned/MemorEasy/releases/latest/download/MemorEasy-macOS) (untested)
-2. Move the downloaded executable/binary to the folder or directory where you want the images to be downloaded
+   - [Windows](https://github.com/bransoned/MemorEasy/releases/latest/download/MemorEasy-Windows-X64.exe)
+   - [Linux](https://github.com/bransoned/MemorEasy/releases/latest/download/MemorEasy-Linux-X64)
+   - [macOS](https://github.com/bransoned/MemorEasy/releases/latest/download/MemorEasy-macOS-ARM64) (ARM)
+   - [macOS](https://github.com/bransoned/MemorEasy/releases/latest/download/MemorEasy-macOS-X64) (X64)
+2. **NOTE:** For MacOS and Linux, you __must__ install the required exiftool dependency:
+   - MacOS: `brew install exiftool`
+   - Linux: `apt install exiftool`
+3. Move the downloaded executable/binary to the folder or directory where you want the images to be downloaded
    - Windows Example: Move `MemorEasy.exe` to `C:\Users\username\Pictures\`
    - Linux/macOS Example: Move `MemorEasy-Linux` or `MemorEasy-macOS` to `~/Pictures/`
-3. Place the `memories_history.html` file in the same folder or directory as the executable/binary file
+4. Place the `memories_history.html` file in the same folder or directory as the executable/binary file
 
 ### Installation from Source (Advanced)