fix(playlist): enable autoplay when switching between items

PKM-er · Mar 18, 2024 · 72edd01 · 72edd01
1 parent 4be3ff5
commit 72edd01
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 7 deletions.
diff --git a/apps/app/src/components/player/buttons.tsx b/apps/app/src/components/player/buttons.tsx
@@ -34,6 +34,7 @@ import {
 } from "@/components/icon";
 import { cn } from "@/lib/utils";
 import { isWithMedia, findWithMedia } from "@/media-note/playlist/def";
+import { toInfoKey } from "../../media-note/note-index";
 import {
   useIsEmbed,
   usePlaylistChange,
@@ -227,7 +228,7 @@ export function Next() {
   if (!(curr && isWithMedia(curr))) return null;
   const next = findWithMedia(
     playlist.list,
-    (li) => !curr.media.compare(li.media),
+    (li) => toInfoKey(curr.media) !== toInfoKey(li.media),
     { fromIndex: playlist.active + 1 },
   );
   if (!next) return null;
@@ -251,7 +252,7 @@ export function Previous() {
   if (!(curr && isWithMedia(curr))) return null;
   const prev = findWithMedia(
     playlist.list,
-    (li) => !curr.media.compare(li.media),
+    (li) => toInfoKey(curr.media) !== toInfoKey(li.media),
     { fromIndex: playlist.active - 1, reverse: true },
   );
   if (!prev) return null;

diff --git a/apps/app/src/components/player/menus.tsx b/apps/app/src/components/player/menus.tsx
@@ -13,6 +13,7 @@ import { MoreIcon, PlaylistIcon, SubtitlesIcon } from "@/components/icon";
 import { showAtButton } from "@/lib/menu";
 import type { PlaylistItem } from "@/media-note/playlist/def";
 import { isWithMedia } from "@/media-note/playlist/def";
+import { toInfoKey } from "../../media-note/note-index";
 import {
   useApp,
   useIsEmbed,
@@ -77,7 +78,7 @@ export function Playlist() {
           item.setTitle(li.title).onClick(() => {
             onPlaylistChange(li, playlist);
           });
-          if (current.compare(li.media)) {
+          if (toInfoKey(current) === toInfoKey(li.media)) {
             item.setChecked(true);
             const checkParent = (node: PlaylistItem) => {
               if (node.parent < 0) return;

diff --git a/apps/app/src/lib/remote-player/html–media-events.ts b/apps/app/src/lib/remote-player/html–media-events.ts
@@ -210,7 +210,7 @@ export class HTMLMediaEvents {
   }
 
   private _onPlay(event: Event) {
-    if (!this._ctx.$state.canPlay) return;
+    if (!this._ctx.$state.canPlay()) return;
     this._notify("play", undefined, new Event(event.type));
   }
 

diff --git a/apps/app/src/lib/remote-player/provider.ts b/apps/app/src/lib/remote-player/provider.ts
@@ -114,7 +114,11 @@ export class WebiviewMediaProvider implements MediaProviderAdapter {
       await this.#interaction;
       return;
     }
-    await (this.#interaction = this.webview.executeJavaScript("1", true));
+    await (this.#interaction = this.webview
+      .executeJavaScript("1", true)
+      .finally(() => {
+        this.#interaction = null;
+      }));
   }
 
   async play() {
@@ -260,6 +264,11 @@ export class WebiviewMediaProvider implements MediaProviderAdapter {
   onDomReady = async (evt: Event) => {
     const webview = this._webview;
     new HTMLMediaEvents(this, this._ctx);
+    Maverick.effect(() => {
+      if (this._ctx.$state.autoPlay()) {
+        this.userGesture();
+      }
+    });
     this._updateTitle(evt);
     // prepare to recieve port, handle plugin load
     await evalInWebview(init, webview);

diff --git a/apps/app/src/media-note/playlist/def.ts b/apps/app/src/media-note/playlist/def.ts
@@ -2,7 +2,6 @@
 import type { TFile } from "obsidian";
 import type { MediaInfo } from "@/media-view/media-info";
 import type { MediaType } from "@/patch/media-type";
-import { type MediaURL } from "@/web/url-match";
 
 export const taskSymbolMediaTypeMap = {
   ">": "video",
@@ -46,7 +45,7 @@ export interface PlaylistItem {
   parent: number;
 }
 export interface PlaylistItemWithMedia extends PlaylistItem {
-  media: MediaURL;
+  media: MediaInfo;
 }
 
 export function isWithMedia(item: PlaylistItem): item is PlaylistItemWithMedia {

diff --git a/apps/app/src/media-view/remote-view.tsx b/apps/app/src/media-view/remote-view.tsx
@@ -165,6 +165,7 @@ export abstract class MediaRemoteView
           store: this.store,
           reload: () => this.render(),
           onPlaylistChange: (item) => {
+            item.media.hash += "&play";
             this.plugin.leafOpener.openMediaIn(this.leaf, item.media);
           },
           embed: false,