Xefir/repod
1
2
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases 37 Wiki Activity

refactor: 🚧 wip

Browse Source
This commit is contained in:
Michel Roux 2024-10-23 13:42:56 +02:00
parent 427c6b2ee8
commit 7b4c39499a
8 changed files with 62 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/Controller/MetricsController.php
View File

@ -5,6 +5,7 @@ declare(strict_types=1);
namespace OCA\RePod\Controller; namespace OCA\RePod\Controller;
use OCA\GPodderSync\Core\PodcastData\PodcastDataReader; use OCA\GPodderSync\Core\PodcastData\PodcastDataReader;
use OCA\GPodderSync\Core\PodcastData\PodcastMetrics;
use OCA\GPodderSync\Core\PodcastData\PodcastMetricsReader; use OCA\GPodderSync\Core\PodcastData\PodcastMetricsReader;
use OCA\RePod\AppInfo\Application; use OCA\RePod\AppInfo\Application;
use OCA\RePod\Service\UserService; use OCA\RePod\Service\UserService;
@ -30,14 +31,19 @@ class MetricsController extends Controller
#[NoCSRFRequired] #[NoCSRFRequired]
#[FrontpageRoute(verb: 'GET', url: '/metrics')] #[FrontpageRoute(verb: 'GET', url: '/metrics')]
public function index(): JSONResponse { public function index(): JSONResponse {
$subscriptions = $this->podcastMetricsReader->metrics($this->userService->getUserUID()); $metrics = $this->podcastMetricsReader->metrics($this->userService->getUserUID());
usort($metrics, fn (PodcastMetrics $a, PodcastMetrics $b) => $b->getListenedSeconds() <=> $a->getListenedSeconds());
$subscriptions = [];
foreach ($metrics as $metric) {
$subscription = $metric->toArray();
foreach ($subscriptions as $id => $subscription) {
try { try {
$subscriptions[$id]['data'] = $this->podcastDataReader->getCachedOrFetchPodcastData($subscription->getUrl(), $this->userService->getUserUID()); $subscription['data'] = $this->podcastDataReader->getCachedOrFetchPodcastData($metric->getUrl(), $this->userService->getUserUID());
} catch (\Exception $e) { } catch (\Exception $e) {
continue;
} }
$subscriptions[] = $subscription;
} }
return new JSONResponse($subscriptions); return new JSONResponse($subscriptions);

4
package.json
View File

@ -7,8 +7,8 @@
"dev": "vite --mode development build", "dev": "vite --mode development build",
"dev:watch": "vite --mode development build --watch", "dev:watch": "vite --mode development build --watch",
"watch": "npm run dev:watch", "watch": "npm run dev:watch",
"lint": "eslint src", "lint": "vue-tsc && eslint src",
"lint:fix": "eslint src --fix", "lint:fix": "vue-tsc && eslint src --fix",
"stylelint": "stylelint src/**/*.vue src/**/*.scss src/**/*.css", "stylelint": "stylelint src/**/*.vue src/**/*.scss src/**/*.css",
"stylelint:fix": "stylelint src/**/*.vue src/**/*.scss src/**/*.css --fix" "stylelint:fix": "stylelint src/**/*.vue src/**/*.scss src/**/*.css --fix"
}, },

22
src/components/Feed/Favorite.vue
View File

@ -1,15 +1,15 @@
<template> <template>
<NcGuestContent class="guest"> <NcGuestContent class="guest">
<Loading v-if="!feed.data" /> <Loading v-if="!metric.data" />
<NcAvatar <NcAvatar
v-if="feed.data" v-if="metric.data"
class="avatar" class="avatar"
:display-name="feed.data.author || feed.data.title" :display-name="metric.data.author || metric.data.title"
:is-no-user="true" :is-no-user="true"
:size="222" :size="222"
:url="feed.data.imageUrl" /> :url="metric.data.imageUrl" />
<div v-if="feed.data" class="list"> <div v-if="metric.data" class="list">
<h2 class="title">{{ feed.data.title }}</h2> <h2 class="title">{{ metric.data.title }}</h2>
<Loading v-if="loading" /> <Loading v-if="loading" />
<ul v-if="!loading"> <ul v-if="!loading">
<Episode <Episode
@ -17,14 +17,14 @@
:key="episode.guid" :key="episode.guid"
:episode="episode" :episode="episode"
:one-line="true" :one-line="true"
:url="feed.metrics.url" /> :url="metric.url" />
</ul> </ul>
</div> </div>
</NcGuestContent> </NcGuestContent>
</template> </template>
<script lang="ts"> <script lang="ts">
import type { EpisodeInterface, SubscriptionInterface } from '../../utils/types.ts' import type { EpisodeInterface, PodcastMetricsInterface } from '../../utils/types.ts'
import { NcAvatar, NcGuestContent } from '@nextcloud/vue' import { NcAvatar, NcGuestContent } from '@nextcloud/vue'
import Episode from './Episode.vue' import Episode from './Episode.vue'
import Loading from '../Atoms/Loading.vue' import Loading from '../Atoms/Loading.vue'
@ -43,8 +43,8 @@ export default {
NcGuestContent, NcGuestContent,
}, },
props: { props: {
feed: { metric: {
type: Object as () => SubscriptionInterface, type: Object as () => PodcastMetricsInterface,
required: true, required: true,
}, },
}, },
@ -57,7 +57,7 @@ export default {
this.loading = true this.loading = true
const episodes = await axios.get<EpisodeInterface[]>( const episodes = await axios.get<EpisodeInterface[]>(
generateUrl('/apps/repod/episodes/list?url={url}', { generateUrl('/apps/repod/episodes/list?url={url}', {
url: this.feed.metrics.url, url: this.metric.url,
}), }),
) )
this.episodes = [...episodes.data] this.episodes = [...episodes.data]

63
src/components/Sidebar/Subscription.vue
View File

@ -1,18 +1,18 @@
<template> <template>
<NcAppNavigationItem <NcAppNavigationItem
:loading="loading" :loading="loading"
:name="feed?.data?.title || url" :name="metric.data?.title || url"
:to="toFeedUrl(url)"> :to="toFeedUrl(url)">
<template #actions> <template #actions>
<NcActionButton <NcActionButton
:aria-label="t('repod', 'Favorite')" :aria-label="t('repod', 'Favorite')"
:model-value="feed?.isFavorite" :model-value="metric.isFavorite"
:name="t('repod', 'Favorite')" :name="t('repod', 'Favorite')"
:title="t('repod', 'Favorite')" :title="t('repod', 'Favorite')"
@update:modelValue="switchFavorite($event)"> @update:modelValue="switchFavorite($event)">
<template #icon> <template #icon>
<StarPlusIcon v-if="!feed?.isFavorite" :size="20" /> <StarPlusIcon v-if="!metric.isFavorite" :size="20" />
<StarRemoveIcon v-if="feed?.isFavorite" :size="20" /> <StarRemoveIcon v-if="metric.isFavorite" :size="20" />
</template> </template>
</NcActionButton> </NcActionButton>
<NcActionButton <NcActionButton
@ -27,10 +27,10 @@
</template> </template>
<template #icon> <template #icon>
<NcAvatar <NcAvatar
:display-name="feed?.data?.author || feed?.data?.title" :display-name="metric.data?.author || metric.data?.title"
:is-no-user="true" :is-no-user="true"
:url="feed?.data?.imageUrl" /> :url="metric.data?.imageUrl" />
<StarIcon v-if="feed?.isFavorite" class="star" :size="20" /> <StarIcon v-if="metric.isFavorite" class="star" :size="20" />
<AlertIcon v-if="failed" /> <AlertIcon v-if="failed" />
</template> </template>
</NcAppNavigationItem> </NcAppNavigationItem>
@ -41,7 +41,7 @@ import { NcActionButton, NcAppNavigationItem, NcAvatar } from '@nextcloud/vue'
import { mapActions, mapState } from 'pinia' import { mapActions, mapState } from 'pinia'
import AlertIcon from 'vue-material-design-icons/Alert.vue' import AlertIcon from 'vue-material-design-icons/Alert.vue'
import DeleteIcon from 'vue-material-design-icons/Delete.vue' import DeleteIcon from 'vue-material-design-icons/Delete.vue'
import type { PersonalSettingsPodcastDataInterface } from '../../utils/types.ts' import type { PodcastMetricsInterface } from '../../utils/types.ts'
import StarIcon from 'vue-material-design-icons/Star.vue' import StarIcon from 'vue-material-design-icons/Star.vue'
import StarPlusIcon from 'vue-material-design-icons/StarPlus.vue' import StarPlusIcon from 'vue-material-design-icons/StarPlus.vue'
import StarRemoveIcon from 'vue-material-design-icons/StarRemove.vue' import StarRemoveIcon from 'vue-material-design-icons/StarRemove.vue'
@ -65,42 +65,21 @@ export default {
StarRemoveIcon, StarRemoveIcon,
}, },
props: { props: {
url: { metric: {
type: String, type: Object as () => PodcastMetricsInterface,
required: true, required: true,
}, },
}, },
data: () => ({ data() {
failed: false, return {
loading: true, loading: false,
}),
computed: {
...mapState(useSubscriptions, ['subs']),
feed() {
return this.subs.find((sub) => sub.metrics.url === this.url)
},
},
async mounted() {
try {
const podcastData =
await axios.get<PersonalSettingsPodcastDataInterface>(
generateUrl(
'/apps/gpoddersync/personal_settings/podcast_data?url={url}',
{
url: this.url,
},
),
)
this.addMetadatas(this.url, podcastData.data.data)
} catch (e) {
this.failed = true
console.error(e)
} finally {
this.loading = false
} }
}, },
computed: {
...mapState(useSubscriptions, ['getSubByUrl', 'subs']),
},
methods: { methods: {
...mapActions(useSubscriptions, ['fetch', 'addMetadatas', 'setFavorite']), ...mapActions(useSubscriptions, ['fetch', 'setFavorite']),
t, t,
toFeedUrl, toFeedUrl,
async deleteSubscription() { async deleteSubscription() {
@ -113,14 +92,14 @@ export default {
this.loading = true this.loading = true
await axios.post( await axios.post(
generateUrl('/apps/gpoddersync/subscription_change/create'), generateUrl('/apps/gpoddersync/subscription_change/create'),
{ add: [], remove: [this.url] }, { add: [], remove: [this.metric.url] },
) )
} catch (e) { } catch (e) {
console.error(e) console.error(e)
showError(t('repod', 'Error while removing the feed')) showError(t('repod', 'Error while removing the feed'))
} finally { } finally {
this.setFavorite(this.url, false) this.setFavorite(this.metric.url, false)
this.loading = false this.loading = true
this.fetch() this.fetch()
} }
} }
@ -132,7 +111,7 @@ export default {
return return
} }
} }
this.setFavorite(this.url, value) this.setFavorite(this.metric.url, value)
}, },
}, },
} }

8
src/components/Sidebar/Subscriptions.vue
View File

@ -13,12 +13,12 @@
<NcAppNavigationList v-if="!loading"> <NcAppNavigationList v-if="!loading">
<Subscription <Subscription
v-for="sub of subs.filter((sub) => sub.isFavorite)" v-for="sub of subs.filter((sub) => sub.isFavorite)"
:key="sub.metrics.url" :key="sub.url"
:url="sub.metrics.url" /> :metric="sub" />
<Subscription <Subscription
v-for="sub of subs.filter((sub) => !sub.isFavorite)" v-for="sub of subs.filter((sub) => !sub.isFavorite)"
:key="sub.metrics.url" :key="sub.url"
:url="sub.metrics.url" /> :metric="sub" />
</NcAppNavigationList> </NcAppNavigationList>
</NcAppContentList> </NcAppContentList>
</template> </template>

34
src/store/subscriptions.ts
View File

@ -1,20 +1,16 @@
import type {
PersonalSettingsMetricsInterface,
PodcastDataInterface,
SubscriptionInterface,
} from '../utils/types.ts'
import { getCookie, setCookie } from '../utils/cookies.ts' import { getCookie, setCookie } from '../utils/cookies.ts'
import type { PodcastMetricsInterface } from '../utils/types.ts'
import axios from '@nextcloud/axios' import axios from '@nextcloud/axios'
import { defineStore } from 'pinia' import { defineStore } from 'pinia'
import { generateUrl } from '@nextcloud/router' import { generateUrl } from '@nextcloud/router'
export const useSubscriptions = defineStore('subscriptions', { export const useSubscriptions = defineStore('subscriptions', {
state: () => ({ state: () => ({
subs: [] as SubscriptionInterface[], subs: [] as PodcastMetricsInterface[],
}), }),
getters: { getters: {
getSubByUrl: (state) => (url: string) => getSubByUrl: (state) => (url: string) =>
state.subs.find((sub) => sub.metrics.url === url), state.subs.find((sub) => sub.url === url),
}, },
actions: { actions: {
async fetch() { async fetch() {
@ -23,34 +19,24 @@ export const useSubscriptions = defineStore('subscriptions', {
favorites = JSON.parse(getCookie('repod.favorites') || '[]') || [] favorites = JSON.parse(getCookie('repod.favorites') || '[]') || []
} catch {} } catch {}
const metrics = await axios.get<PersonalSettingsMetricsInterface>( const metrics = await axios.get<PodcastMetricsInterface[]>(
generateUrl('/apps/repod/metrics'), generateUrl('/apps/repod/metrics'),
) )
this.subs = [...metrics.data.subscriptions] this.subs = [...metrics.data].map((sub) => ({
.sort((a, b) => b.listenedSeconds - a.listenedSeconds) ...sub,
.map((sub) => ({ isFavorite: favorites.includes(sub.url),
metrics: sub, }))
isFavorite: favorites.includes(sub.url),
data: this.subs.find((s) => s.metrics.url === sub.url)?.data,
}))
},
addMetadatas(link: string, data: PodcastDataInterface) {
this.subs = this.subs.map((sub) =>
sub.metrics.url === link ? { ...sub, data } : sub,
)
}, },
setFavorite(link: string, isFavorite: boolean) { setFavorite(link: string, isFavorite: boolean) {
this.subs = this.subs.map((sub) => this.subs = this.subs.map((sub) =>
sub.metrics.url === link ? { ...sub, isFavorite } : sub, sub.url === link ? { ...sub, isFavorite } : sub,
) )
setCookie( setCookie(
'repod.favorites', 'repod.favorites',
JSON.stringify( JSON.stringify(
this.subs this.subs.filter((sub) => sub.isFavorite).map((sub) => sub.url),
.filter((sub) => sub.isFavorite)
.map((sub) => sub.metrics.url),
), ),
365, 365,
) )

12
src/utils/types.ts
View File

@ -56,16 +56,8 @@ export interface PodcastMetricsInterface {
new: number new: number
play: number play: number
} }
} data: PodcastDataInterface
isFavorite?: boolean
export interface SubscriptionInterface {
data?: PodcastDataInterface
isFavorite: boolean
metrics: PodcastMetricsInterface
}
export interface PersonalSettingsMetricsInterface {
subscriptions: PodcastMetricsInterface[]
} }
export interface PersonalSettingsPodcastDataInterface { export interface PersonalSettingsPodcastDataInterface {

4
src/views/Home.vue
View File

@ -11,8 +11,8 @@
</template> </template>
</EmptyContent> </EmptyContent>
<ul v-if="favorites.length"> <ul v-if="favorites.length">
<li v-for="favorite in favorites" :key="favorite.metrics.url"> <li v-for="favorite in favorites" :key="favorite.url">
<Favorite :feed="favorite" /> <Favorite :metric="favorite" />
</li> </li>
</ul> </ul>
</AppContent> </AppContent>