diff --git a/package.json b/package.json index 3449481..c0601e8 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "Miru", - "version": "3.9.4", + "version": "3.9.5", "author": "ThaUnknown_ ", "description": "Stream anime torrents, real-time with no waiting for downloads.", "main": "src/index.js", diff --git a/src/renderer/src/lib/Home/Cards.svelte b/src/renderer/src/lib/Home/Cards.svelte index cd19831..b0d522a 100644 --- a/src/renderer/src/lib/Home/Cards.svelte +++ b/src/renderer/src/lib/Home/Cards.svelte @@ -75,21 +75,29 @@ {/if}

- {#if card.media.format === 'TV'} - TV Show - {:else if card.media.format} - {card.media.format?.toLowerCase().replace(/_/g, ' ')} - {/if} - {#if card.media.episodes} - {card.media.episodes + ' Episodes'} + + {#if card.media.format === 'TV'} + TV Show + {:else if card.media.format} + {card.media.format?.toLowerCase().replace(/_/g, ' ')} + {/if} + + {#if card.media.episodes && card.media.episodes !== 1} + + {#if card.media.mediaListEntry?.status === 'CURRENT' && card.media.mediaListEntry?.progress } + {card.media.mediaListEntry.progress} / {card.media.episodes} Episodes + {:else} + {card.media.episodes} Episodes + {/if} + {:else if card.media.duration} - {card.media.duration + ' Minutes'} + {card.media.duration + ' Minutes'} {/if} {#if card.media.status} - {card.media.status?.toLowerCase().replace(/_/g, ' ')} + {card.media.status?.toLowerCase().replace(/_/g, ' ')} {/if} {#if card.media.season || card.media.seasonYear} - + {[card.media.season?.toLowerCase(), card.media.seasonYear].filter(s => s).join(' ')} {/if} @@ -135,6 +143,7 @@ .details span + span::before { content: ' • '; + white-space: normal; } .card { animation: 0.3s ease 0s 1 load-in; diff --git a/src/renderer/src/lib/ViewAnime/Details.svelte b/src/renderer/src/lib/ViewAnime/Details.svelte index c0f4878..d9ebce0 100644 --- a/src/renderer/src/lib/ViewAnime/Details.svelte +++ b/src/renderer/src/lib/ViewAnime/Details.svelte @@ -20,9 +20,6 @@ ] function getCustomProperty (detail, media) { if (detail.property === 'episodes') { - if (media.mediaListEntry?.progress) { - return `Watched ${media.mediaListEntry.progress} of ${getMediaMaxEp(media)}` - } return `${getMediaMaxEp(media)} Episodes` } else if (detail.property === 'averageScore') { return media.averageScore + '%' diff --git a/src/renderer/src/lib/ViewAnime/ViewAnime.svelte b/src/renderer/src/lib/ViewAnime/ViewAnime.svelte index 7bf543f..f1af835 100644 --- a/src/renderer/src/lib/ViewAnime/ViewAnime.svelte +++ b/src/renderer/src/lib/ViewAnime/ViewAnime.svelte @@ -136,6 +136,17 @@

+ {#if media.mediaListEntry?.progress} +

Progress

+
+
+
+
+
+ {media.mediaListEntry?.progress} / {getMediaMaxEp(media)} Available Episodes +
+
+ {/if}