fixed adn and updated packages

This commit is contained in:
stratuma 2024-07-10 14:20:30 +02:00
parent cf76776eb6
commit 245a5b141c
6 changed files with 695 additions and 1254 deletions

View File

@ -4,14 +4,25 @@ export async function getEpisodesWithShowIdADN(id: number, lang: 'de' | 'fr') {
const { data, error } = await useFetch<ADNEpisodesFetch>(`https://gw.api.animationdigitalnetwork.fr/video/show/${id}?offset=0&limit=-1&order=asc`, { const { data, error } = await useFetch<ADNEpisodesFetch>(`https://gw.api.animationdigitalnetwork.fr/video/show/${id}?offset=0&limit=-1&order=asc`, {
method: 'GET', method: 'GET',
headers: { headers: {
'x-target-distribution': lang 'x-target-distribution': 'de'
} }
}) })
if (error.value || !data.value) { if (error.value || !data.value) {
console.log(error.value) const { data: newdata, error: newerror } = await useFetch<ADNEpisodesFetch>(`https://gw.api.animationdigitalnetwork.fr/video/show/${id}?offset=0&limit=-1&order=asc`, {
alert(error.value) method: 'GET',
return headers: {
'x-target-distribution': 'fr'
}
})
if (newerror.value || !newdata.value) {
console.log(error.value)
alert(error.value)
return
}
return newdata.value.videos
} }
return data.value.videos return data.value.videos

View File

@ -1,7 +1,7 @@
<template> <template>
<div class="flex flex-col mt-3 gap-3 font-dm overflow-y-scroll h-[calc(100%)]" style="-webkit-app-region: no-drag"> <div class="flex flex-col mt-3 gap-3 font-dm overflow-y-scroll h-[calc(100%)]" style="-webkit-app-region: no-drag">
<div class="flex flex-col items-center p-3 bg-[#11111189] rounded-xl select-none"> <div class="flex flex-col items-center p-3 bg-[#11111189] rounded-xl select-none gap-2">
<div class="text-sm mb-2"> Account Management </div> <div class="text-sm"> Account Management </div>
<div v-for="account in accounts" class="flex flex-row items-center h-12 p-3 w-full bg-[#4b4b4b89] rounded-xl"> <div v-for="account in accounts" class="flex flex-row items-center h-12 p-3 w-full bg-[#4b4b4b89] rounded-xl">
<Icon v-if="account.service === 'CR'" name="simple-icons:crunchyroll" class="h-6 w-6 text-white" /> <Icon v-if="account.service === 'CR'" name="simple-icons:crunchyroll" class="h-6 w-6 text-white" />
<Icon v-if="account.service === 'ADN'" name="arcticons:animeultima" class="h-6 w-6 text-white" /> <Icon v-if="account.service === 'ADN'" name="arcticons:animeultima" class="h-6 w-6 text-white" />

View File

@ -47,7 +47,7 @@ const seasonNumber = ref<number>(1)
const quality = ref<number>(1080) const quality = ref<number>(1080)
const seriesName = ref<string>('Frieren') const seriesName = ref<string>('Frieren')
const episodeName = ref<string>("The Journey's End") const episodeName = ref<string>("The Journey's End")
const episodeID = ref<string>("G0DUNDOK2") const episodeID = ref<string>('G0DUNDOK2')
const episodeNamingTemplate = ref<string>() const episodeNamingTemplate = ref<string>()
const seasonNamingTemplate = ref<string>() const seasonNamingTemplate = ref<string>()
const isSeasonActive = ref<boolean>() const isSeasonActive = ref<boolean>()

View File

@ -2,7 +2,7 @@
"name": "crunchydl", "name": "crunchydl",
"author": "OpenSTDL", "author": "OpenSTDL",
"description": "Crunchyroll Downloader", "description": "Crunchyroll Downloader",
"version": "1.2.4", "version": "1.2.5",
"private": true, "private": true,
"main": ".output/src/electron/background.js", "main": ".output/src/electron/background.js",
"repository": "https://github.com/OpenSTDL/CrunchyDL", "repository": "https://github.com/OpenSTDL/CrunchyDL",
@ -29,7 +29,7 @@
"@types/node-cron": "^3.0.11", "@types/node-cron": "^3.0.11",
"concurrently": "^8.2.2", "concurrently": "^8.2.2",
"dotenv": "^16.4.5", "dotenv": "^16.4.5",
"electron": "^30.1.2", "electron": "^30.2.0",
"electron-builder": "^24.13.3", "electron-builder": "^24.13.3",
"eslint": "^8.57.0", "eslint": "^8.57.0",
"eslint-config-prettier": "^8.10.0", "eslint-config-prettier": "^8.10.0",
@ -38,10 +38,10 @@
"nuxt": "3.11.2", "nuxt": "3.11.2",
"nuxt-icon": "^0.6.10", "nuxt-icon": "^0.6.10",
"prettier": "^2.8.8", "prettier": "^2.8.8",
"sass": "^1.77.6", "sass": "^1.77.7",
"sass-loader": "^13.3.3", "sass-loader": "^13.3.3",
"tsc-watch": "^6.2.0", "tsc-watch": "^6.2.0",
"typescript": "^5.5.2", "typescript": "^5.5.3",
"wait-on": "^7.2.0" "wait-on": "^7.2.0"
}, },
"dependencies": { "dependencies": {
@ -53,7 +53,7 @@
"electron-settings": "^4.0.4", "electron-settings": "^4.0.4",
"electron-updater": "^6.2.1", "electron-updater": "^6.2.1",
"express": "^4.19.2", "express": "^4.19.2",
"fastify": "^4.28.0", "fastify": "^4.28.1",
"fluent-ffmpeg": "^2.1.3", "fluent-ffmpeg": "^2.1.3",
"long": "^5.2.3", "long": "^5.2.3",
"mpd-parser": "^1.3.0", "mpd-parser": "^1.3.0",
@ -66,14 +66,9 @@
}, },
"build": { "build": {
"files": [ "files": [
"!**/pages/*", ".output/**/*",
"!**/ffmpeg/*", "node_modules/**/*",
"!**/shaka/*", "package.json"
"!**/.git/*",
"!**/.github/*",
"!**/.nuxt/*",
"!**/.vscode/*",
"!**/*.md"
], ],
"extraResources": [ "extraResources": [
"./ffmpeg/**", "./ffmpeg/**",

View File

@ -191,7 +191,7 @@
</div> </div>
<div v-if="selectDub" class="absolute top-full left-0 w-full bg-[#868585] rounded-xl grid grid-cols-12 gap-1 p-1 z-10"> <div v-if="selectDub" class="absolute top-full left-0 w-full bg-[#868585] rounded-xl grid grid-cols-12 gap-1 p-1 z-10">
<button <button
v-if="ADNselectedShow.languages.find((l) => l === 'vostde') || ADNselectedShow.languages.find((l) => l === 'vostfr')" v-if="ADNselectedShow.languages.find((l) => l === 'vostde' || l === 'vostf') || ADNselectedShow.languages.find((l) => l === 'vostfr')"
@click="toggleDubADN({ locale: 'ja-JP', name: 'JP' })" @click="toggleDubADN({ locale: 'ja-JP', name: 'JP' })"
class="flex flex-row items-center justify-center gap-3 py-2 rounded-xl text-sm" class="flex flex-row items-center justify-center gap-3 py-2 rounded-xl text-sm"
:class="selectedDubs.find((i) => i.locale === 'ja-JP') ? 'bg-[#585858]' : 'hover:bg-[#747474]'" :class="selectedDubs.find((i) => i.locale === 'ja-JP') ? 'bg-[#585858]' : 'hover:bg-[#747474]'"
@ -670,7 +670,7 @@ const switchToSeason = async () => {
selectedStartEpisodeADN.value = episodesADN.value[0] selectedStartEpisodeADN.value = episodesADN.value[0]
selectedEndEpisodeADN.value = episodesADN.value[0] selectedEndEpisodeADN.value = episodesADN.value[0]
tab.value = 2 tab.value = 2
selectedDubs.value = [{ locale: 'ja-JP', name: 'JP' }] selectedDubs.value = []
selectedSubs.value = [] selectedSubs.value = []
} }
@ -698,7 +698,7 @@ const switchToSeason = async () => {
} }
} }
} else { } else {
selectedDubs.value = [{ locale: 'ja-JP', name: 'JP' }] selectedDubs.value = []
} }
if (subLocales.value && subLocales.value.length !== 0) { if (subLocales.value && subLocales.value.length !== 0) {
@ -747,7 +747,7 @@ const switchToSeason = async () => {
} }
} }
} else { } else {
selectedDubs.value = [{ locale: 'ja-JP', name: 'JP' }] selectedDubs.value = []
} }
if (subLocales.value && subLocales.value.length !== 0) { if (subLocales.value && subLocales.value.length !== 0) {
@ -800,7 +800,7 @@ const switchToSeason = async () => {
} }
} }
} else { } else {
selectedDubs.value = [{ locale: 'ja-JP', name: 'JP' }] selectedDubs.value = []
} }
if (subLocales.value && subLocales.value.length !== 0) { if (subLocales.value && subLocales.value.length !== 0) {

File diff suppressed because it is too large Load Diff