Merge pull request #211 from kishikawakatsumi/ex

Ex

Author: kishikawakatsumi

.github/workflows/test.yml

@@ -19,7 +19,12 @@ jobs:
           set -ex
 
           brew update
-          brew install docker docker-compose qemu
+          brew install docker docker-buildx docker-compose qemu
+
+          mkdir -p ~/.docker/cli-plugins
+          ln -sfn /opt/homebrew/opt/docker-compose/bin/docker-compose ~/.docker/cli-plugins/docker-compose
+          ln -sfn /opt/homebrew/opt/docker-buildx/bin/docker-buildx ~/.docker/cli-plugins/docker-buildx
+
           curl -L "https://raw.githubusercontent.com/Homebrew/homebrew-core/5d01145b5a83d32e5ebee11677884ee429a6be4e/Formula/l/lima.rb" \
             -o lima.rb
           curl -L "https://raw.githubusercontent.com/Homebrew/homebrew-core/b8276941690ad4235558c4848b747eb21656f178/Formula/c/colima.rb" \
@@ -35,6 +40,8 @@ jobs:
           sudo chmod +x "$LIMACTL_PATH"
 
           colima start --network-address --arch arm64 --vm-type=qemu
+          export DOCKER_BUILDKIT=1
+          export COMPOSE_DOCKER_CLI_BUILD=1
           docker-compose up --detach
 
           swift test

Examples/FileBrowser/FileBrowser (macOS)/MediaPlayerWindowController.swift

@@ -53,29 +53,42 @@ class MediaPlayerWindowController: NSWindowController, NSWindowDelegate {
 
     guard let videoPlayerViewController = contentViewController as? MediaPlayerViewController else { return }
 
-    let playerItem = AVPlayerItem(asset: asset)
+    Task { @MainActor in
+      do {
+        let fileReader = try await treeAccessor.fileReader(path: path)
+        _ = try await fileReader.read(offset: 0, length: 1)
 
-    let player = AVPlayer(playerItem: playerItem)
-    videoPlayerViewController.playerView.player = player
+        let playerItem = AVPlayerItem(asset: asset)
 
-    asset.loadTracks(withMediaType: .video) { (tracks, error) in
-      guard let track = tracks?.first else { return }
-      Task {
-        let naturalSize = try await track.load(.naturalSize)
+        let player = AVPlayer(playerItem: playerItem)
+        videoPlayerViewController.playerView.player = player
 
-        await MainActor.run {
-          guard let currentScreen = NSScreen.screens.first(where: { $0 == window.screen }) else {
-            return
-          }
+        asset.loadTracks(withMediaType: .video) { (tracks, error) in
+          guard let track = tracks?.first else { return }
+          Task {
+            let naturalSize = try await track.load(.naturalSize)
+
+            await MainActor.run {
+              guard let currentScreen = NSScreen.screens.first(where: { $0 == window.screen }) else {
+                return
+              }
 
-          let rect = AVMakeRect(
-            aspectRatio: CGSize(width: naturalSize.width, height: naturalSize.height),
-            insideRect: currentScreen.visibleFrame
-          )
-          let contentSize = NSSize(width: min(rect.width, naturalSize.width), height: min(rect.height, naturalSize.height))
+              let rect = AVMakeRect(
+                aspectRatio: CGSize(width: naturalSize.width, height: naturalSize.height),
+                insideRect: currentScreen.visibleFrame
+              )
+              let contentSize = NSSize(width: min(rect.width, naturalSize.width), height: min(rect.height, naturalSize.height))
 
-          window.setContentSize(contentSize)
-          window.center()
+              window.setContentSize(contentSize)
+              window.center()
+
+              player.play()
+            }
+          }
+        }
+      } catch {
+        _ = await MainActor.run {
+          NSAlert(error: error).runModal()
         }
       }
     }
@@ -91,20 +104,4 @@ class MediaPlayerWindowController: NSWindowController, NSWindowDelegate {
 
 class MediaPlayerViewController: NSViewController {
   @IBOutlet var playerView: AVPlayerView!
-  private var observation: NSKeyValueObservation?
-
-  deinit {
-    observation?.invalidate()
-  }
-
-  override func viewDidAppear() {
-    super.viewDidAppear()
-
-    let player = playerView.player
-    observation = playerView.player?.currentItem?.observe(\.status) { (item, change) in
-      if item.status == .readyToPlay {
-        player?.play()
-      }
-    }
-  }
 }