Enhancement (#25)

Author: HackingGate

.github/workflows/lint.yml

@@ -33,7 +33,7 @@ jobs:
         uses: stefanzweifel/git-auto-commit-action@v5
         with:
           branch: ${{ github.event.pull_request.head.ref || github.head_ref || github.ref }}
-          file_pattern: "*.sh *.yml *.md *.json"
+          file_pattern: "setup.sh .github/**/*.yml README.md mpvx/**/*.json"
           commit_message: "chore: fix linting issues"
           commit_user_name: super-linter
           commit_user_email: [email protected]

.github/workflows/release.yml

@@ -54,6 +54,13 @@ jobs:
           GCM_SENDER_ID: ${{ secrets.GCM_SENDER_ID }}
         run: |
           ./setup.sh
+      - name: Restore Build Cache
+        uses: actions/cache@v3
+        with:
+          path: build
+          key: build-cache-${{ runner.os }}-${{ matrix.os }}-${{ matrix.arch }}-${{ hashFiles('**/Package.resolved') }}
+          restore-keys: |
+            build-cache-${{ runner.os }}-${{ matrix.os }}-${{ matrix.arch }}-
       - name: Archive
         run: |
           xcodebuild clean archive \
@@ -63,6 +70,11 @@ jobs:
             -destination "platform=macOS"
           mkdir -p build/Build/Products/Release
           cp -R build/mpvx.xcarchive/Products/Applications/mpvx.app build/Build/Products/Release/mpvx.app
+      - name: Save Build Cache
+        uses: actions/cache@v3
+        with:
+          path: build
+          key: build-cache-${{ runner.os }}-${{ matrix.os }}-${{ matrix.arch }}-${{ hashFiles('**/Package.resolved') }}
       - name: Install create-dmg
         run: |
           brew install create-dmg
@@ -78,24 +90,28 @@ jobs:
             --icon "mpvx.app" 200 200 \
             ./dist/mpvx.dmg \
             ./build/Build/Products/Release/mpvx.app
-      - name: Download latest Sparkle CLI
+      - name: Download Sparkle CLI (version from Package.resolved)
         run: |
-          # wget ${GITHUB_API_URL}/repos/sparkle-project/Sparkle/releases/latest -O sparkle.json
-          # cat sparkle.json | jq
-          # DOWNLOAD_URL=`cat sparkle.json | jq -r '.assets[] | select(.name == "Sparkle-for-Swift-Package-Manager.zip").browser_download_url'`
-          # if [ -z "$DOWNLOAD_URL" ]; then
-          #   echo "Error: Could not find a Sparkle-for-Swift-Package-Manager.zip asset in the latest Sparkle release."
-          #   exit 1
-          # fi
-          # Workaround: Use a fixed version of Sparkle CLI for now to fix API rate limit issue
-          DOWNLOAD_URL="https://github.com/sparkle-project/Sparkle/releases/download/2.6.4/Sparkle-for-Swift-Package-Manager.zip"
+          # Extract Sparkle version from Package.resolved
+          SPARKLE_VERSION=$(jq -r '.pins[] | select(.identity == "sparkle") | .state.version' \
+            mpvx.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved)
+          if [ -z "$SPARKLE_VERSION" ]; then
+            echo "Error: Could not determine Sparkle version from Package.resolved."
+            exit 1
+          fi
+          echo "Detected Sparkle version: $SPARKLE_VERSION"
+          # Construct download URL
+          DOWNLOAD_URL="https://github.com/sparkle-project/Sparkle/releases/download/${SPARKLE_VERSION}/Sparkle-for-Swift-Package-Manager.zip"
           echo "Downloading Sparkle CLI from \`${DOWNLOAD_URL}\`..."
+          # Download and unzip Sparkle CLI
           wget -O /tmp/Sparkle-for-Swift-Package-Manager.zip "${DOWNLOAD_URL}"
           echo "Unzipping Sparkle CLI to \`/tmp/sparkle\`..."
           unzip /tmp/Sparkle-for-Swift-Package-Manager.zip -d /tmp/sparkle
+          # Make CLI tools executable
           echo "Making CLI tools executable..."
           chmod +x /tmp/sparkle/bin/generate_appcast
           chmod +x /tmp/sparkle/bin/sign_update
+          # Copy CLI tools to the workspace
           echo "Copying CLI tools to \`${GITHUB_WORKSPACE}\`..."
           cp /tmp/sparkle/bin/generate_appcast $GITHUB_WORKSPACE/
           cp /tmp/sparkle/bin/sign_update $GITHUB_WORKSPACE/

.github/workflows/test-and-coverage.yml

@@ -33,14 +33,26 @@ jobs:
       - name: Setup
         run: |
           ./setup.sh
+      - name: Restore Build Cache
+        uses: actions/cache@v3
+        with:
+          path: build
+          key: build-cache-${{ runner.os }}-${{ matrix.os }}-${{ matrix.arch }}-${{ hashFiles('**/Package.resolved') }}
+          restore-keys: |
+            build-cache-${{ runner.os }}-${{ matrix.os }}-${{ matrix.arch }}-
       - name: Run Tests
         run: |
-          xcodebuild clean test \
+          xcodebuild test \
             -scheme mpvx \
             -configuration Debug \
             -derivedDataPath build \
             -destination "platform=macOS,arch=${{ matrix.arch }}" \
             -resultBundlePath "artifacts/ResultBundle-${{ matrix.os }}-${{ matrix.arch }}.xcresult"
+      - name: Save Build Cache
+        uses: actions/cache@v3
+        with:
+          path: build
+          key: build-cache-${{ runner.os }}-${{ matrix.os }}-${{ matrix.arch }}-${{ hashFiles('**/Package.resolved') }}
       - name: Upload Result Bundle
         uses: actions/upload-artifact@v4
         with:

mpvx/AppDelegate+Handlers.swift

@@ -6,11 +6,6 @@ extension AppDelegate {
             .response: response.rawValue,
             .urlCount: urls.count
         ])
-        for url in urls {
-            AnalyticsLogger.logEvent(.openUrl, parameters: [
-                .urlPath: url.lastPathComponent.truncatedFilename(to: 100)
-            ])
-        }
         if response == .OK {
             Task(priority: .userInitiated) {
                 do {
@@ -91,9 +86,6 @@ extension AppDelegate {
         switch result {
         case .terminated:
             for url in urls {
-                AnalyticsLogger.logEvent(.recentDocumentAdded, parameters: [
-                    .urlPath: url.lastPathComponent.truncatedFilename(to: 100)
-                ])
                 NSDocumentController.shared.noteNewRecentDocumentURL(url)
             }
         }

mpvx/AppDelegate+NSApplicationDelegate.swift

@@ -35,11 +35,6 @@ extension AppDelegate: NSApplicationDelegate {
     }
 
     func application(_ application: NSApplication, open urls: [URL]) {
-        for url in urls {
-            AnalyticsLogger.logEvent(.openUrl, parameters: [
-                .urlPath: url.lastPathComponent.truncatedFilename(to: 100)
-            ])
-        }
         Task(priority: .userInitiated) {
             do {
                 try await mpvLauncher.launch(with: urls) { result in