Mirrors/CrunchyDL
Archived
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

removed unused non-drm and key checks

Browse Source
This commit is contained in:
stratuma 2024-06-29 21:46:39 +02:00
parent ff4622b14a
commit fb5db3cc14
2 changed files with 3 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
components/Settings/Crunchyroll.vue
View File

@ -31,7 +31,6 @@
<option :value="9">Android (DRM PROTECTED)</option> <option :value="9">Android (DRM PROTECTED)</option>
<option :value="10">Samsung TV (DRM PROTECTED)</option> <option :value="10">Samsung TV (DRM PROTECTED)</option>
</select> </select>
<div class="text-xs mt-2"> Fallback to non-drm stream if no widevine key provided </div>
</div> </div>
<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">
<div class="text-sm mb-2">Subtitle Resampler (Experimental)</div> <div class="text-sm mb-2">Subtitle Resampler (Experimental)</div>

33
src/api/routes/crunchyroll/crunchyroll.service.ts
View File

@ -14,12 +14,6 @@ settings.configure({
// Crunchyroll Login Handler // Crunchyroll Login Handler
export async function crunchyLogin(user: string, passw: string, geo: string) { export async function crunchyLogin(user: string, passw: string, geo: string) {
var endpoint = await settings.get('CREndpoint') var endpoint = await settings.get('CREndpoint')
const drmL3blob = await settings.has('l3blob')
const drmL3key = await settings.has('l3key')
if (!drmL3blob || !drmL3key) {
endpoint = 1
}
if (!endpoint) { if (!endpoint) {
await settings.set('CREndpoint', 1) await settings.set('CREndpoint', 1)
@ -72,12 +66,6 @@ async function crunchyLoginFetchProxy(user: string, passw: string, geo: string)
var body var body
var endpoint = await settings.get('CREndpoint') var endpoint = await settings.get('CREndpoint')
const drmL3blob = await settings.has('l3blob')
const drmL3key = await settings.has('l3key')
if (!drmL3blob || !drmL3key) {
endpoint = 1
}
if (!endpoint) { if (!endpoint) {
await settings.set('CREndpoint', 1) await settings.set('CREndpoint', 1)
@ -117,7 +105,7 @@ async function crunchyLoginFetchProxy(user: string, passw: string, geo: string)
return return
} }
if (endpoint !== 1 && drmL3blob && drmL3key) { if (endpoint !== 1) {
headers = { headers = {
Authorization: 'Basic dm52cHJyN21ubW1la2Uyd2xwNTM6V19IdWlNekxUS1JqSnlKZTBHRlFYZXFoTldDREdUM2M=', Authorization: 'Basic dm52cHJyN21ubW1la2Uyd2xwNTM6V19IdWlNekxUS1JqSnlKZTBHRlFYZXFoTldDREdUM2M=',
'Content-Type': 'application/json', 'Content-Type': 'application/json',
@ -200,19 +188,13 @@ async function crunchyLoginFetch(user: string, passw: string) {
var body var body
var endpoint = await settings.get('CREndpoint') var endpoint = await settings.get('CREndpoint')
const drmL3blob = await settings.has('l3blob')
const drmL3key = await settings.has('l3key')
if (!drmL3blob || !drmL3key) {
endpoint = 1
}
if (!endpoint) { if (!endpoint) {
await settings.set('CREndpoint', 1) await settings.set('CREndpoint', 1)
endpoint = 1 endpoint = 1
} }
if (endpoint !== 1 && drmL3blob && drmL3key) { if (endpoint !== 1) {
headers = { headers = {
Authorization: 'Basic dm52cHJyN21ubW1la2Uyd2xwNTM6V19IdWlNekxUS1JqSnlKZTBHRlFYZXFoTldDREdUM2M=', Authorization: 'Basic dm52cHJyN21ubW1la2Uyd2xwNTM6V19IdWlNekxUS1JqSnlKZTBHRlFYZXFoTldDREdUM2M=',
'Content-Type': 'application/x-www-form-urlencoded', 'Content-Type': 'application/x-www-form-urlencoded',
@ -326,12 +308,6 @@ export async function crunchyGetPlaylist(q: string, geo: string | undefined) {
} }
var endpoint = await settings.get('CREndpoint') var endpoint = await settings.get('CREndpoint')
const drmL3blob = await settings.has('l3blob')
const drmL3key = await settings.has('l3key')
if (!drmL3blob || !drmL3key) {
endpoint = 1
}
if (!endpoint) { if (!endpoint) {
await settings.set('CREndpoint', 1) await settings.set('CREndpoint', 1)
@ -654,7 +630,6 @@ export async function deleteVideoToken(content: string, token: string) {
} else { } else {
decrementPlaylistCounter() decrementPlaylistCounter()
const error = await response.text() const error = await response.text()
// messageBox('error', ['Cancel'], 2, 'Failed to delete Crunchyroll Video Token', 'Failed to delete Crunchyroll Video Token', error)
server.logger.log({ server.logger.log({
level: 'error', level: 'error',
message: 'Failed to disable Crunchyroll Video Token', message: 'Failed to disable Crunchyroll Video Token',
@ -698,7 +673,6 @@ export async function activateVideoToken(content: string, token: string) {
return 'ok' return 'ok'
} else { } else {
const error = await response.text() const error = await response.text()
// messageBox('error', ['Cancel'], 2, 'Failed to delete Crunchyroll Video Token', 'Failed to delete Crunchyroll Video Token', error)
server.logger.log({ server.logger.log({
level: 'error', level: 'error',
message: 'Failed to activate Crunchyroll Video Token', message: 'Failed to activate Crunchyroll Video Token',
@ -824,7 +798,6 @@ export async function getAccountInfo() {
return data return data
} else { } else {
const error = await response.text() const error = await response.text()
messageBox('error', ['Cancel'], 2, 'Failed to get Crunchyroll Account Info', 'Failed to get Crunchyroll Account Info', error)
server.logger.log({ server.logger.log({
level: 'error', level: 'error',
message: 'Failed to get Crunchyroll Account Info', message: 'Failed to get Crunchyroll Account Info',
@ -897,6 +870,6 @@ export async function checkAccountMaxStreams() {
throw new Error(await response.text()) throw new Error(await response.text())
} }
} catch (e) { } catch (e) {
throw new Error(e as string) return 1
} }
} }