From 4ea889951bd7f1f74af7cbbf3ff7ce0fc851ed42 Mon Sep 17 00:00:00 2001
From: ThaUnknown <6506529+ThaUnknown@users.noreply.github.com>
Date: Tue, 19 Mar 2024 21:41:20 +0100
Subject: [PATCH] fix: electron build fix: load anime watch progress

---
 common/views/Player/Player.svelte | 20 +++++++++++++-------
 electron/webpack.config.cjs       |  1 +
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/common/views/Player/Player.svelte b/common/views/Player/Player.svelte
index c992f9f..e873b66 100644
--- a/common/views/Player/Player.svelte
+++ b/common/views/Player/Player.svelte
@@ -201,7 +201,7 @@
   }
 
   async function loadAnimeProgress () {
-    if (!current?.media?.media?.id || !current.media.media.episode || current.media.failed || !media?.media?.id || !media.episode) return
+    if (!current?.media?.media?.id || !current?.media?.episode || current?.media?.failed || !media?.media?.id || !media?.episode) return
 
     const animeProgress = await getAnimeProgress(current.media.media.id, current.media.episode)
     if (!animeProgress) return
@@ -211,7 +211,7 @@
   }
 
   function saveAnimeProgress () {
-    if (!current?.media?.media?.id || !current.media.media.episode || current.media.failed || !media?.media?.id || !media.episode) return
+    if (!current?.media?.media?.id || !current?.media?.episode || current?.media?.failed || !media?.media?.id || !media?.episode) return
 
     if (buffering || paused || video.readyState < 4) return
 
@@ -1036,11 +1036,11 @@
     <!-- eslint-disable-next-line svelte/valid-compile -->
     <div class='w-full h-full position-absolute toggle-immerse d-none' on:dblclick={toggleFullscreen} on:click|self={toggleImmerse} />
     <div class='w-full h-full position-absolute mobile-focus-target d-none' use:click={() => { page = 'player' }} />
-    <span class='d-md-block material-symbols-outlined ctrl' class:d-none={miniplayer} class:text-muted={!hasLast} class:disabled={!hasLast} use:click={playLast}> skip_previous </span>
-    <span class='d-md-block material-symbols-outlined ctrl' class:d-none={miniplayer} use:click={rewind}> fast_rewind </span>
-    <span class='d-md-block material-symbols-outlined ctrl' class:d-none={miniplayer} data-name='playPause' use:click={playPause}> {ended ? 'replay' : paused ? 'play_arrow' : 'pause'} </span>
-    <span class='d-md-block material-symbols-outlined ctrl' class:d-none={miniplayer} use:click={forward}> fast_forward </span>
-    <span class='d-md-block material-symbols-outlined ctrl' class:d-none={miniplayer} class:text-muted={!hasNext} class:disabled={!hasNext} use:click={playNext}> skip_next </span>
+    <span class='material-symbols-outlined ctrl' class:text-muted={!hasLast} class:disabled={!hasLast} use:click={playLast}> skip_previous </span>
+    <span class='material-symbols-outlined ctrl' use:click={rewind}> fast_rewind </span>
+    <span class='material-symbols-outlined ctrl' data-name='playPause' use:click={playPause}> {ended ? 'replay' : paused ? 'play_arrow' : 'pause'} </span>
+    <span class='material-symbols-outlined ctrl' use:click={forward}> fast_forward </span>
+    <span class='material-symbols-outlined ctrl' class:text-muted={!hasNext} class:disabled={!hasNext} use:click={playNext}> skip_next </span>
     <div class='position-absolute bufferingDisplay' />
     {#if currentSkippable}
       <button class='skip btn text-dark position-absolute bottom-0 right-0 mr-20 mb-5 font-weight-bold' use:click={skip}>
@@ -1465,6 +1465,12 @@
         padding-top: max(var(--safe-area-top), env(safe-area-inset-top, 0)) !important;
       }
     }
+    .middle .ctrl {
+      display: flex !important;
+    }
+    .miniplayer .middle .ctrl {
+      display: none !important;
+    }
     .toggle-immerse {
       display: block !important;
     }
diff --git a/electron/webpack.config.cjs b/electron/webpack.config.cjs
index ba9f139..2573b53 100644
--- a/electron/webpack.config.cjs
+++ b/electron/webpack.config.cjs
@@ -21,6 +21,7 @@ module.exports = [
       aliasFields: [],
       mainFields: ['module', 'main', 'node'],
       alias: {
+        '@': resolve(__dirname, '..', 'common'),
         'node-fetch': false,
         ws: false,
         wrtc: false,