lasers/FreeTube
1
0
Fork 0
mirror of https://github.com/FreeTubeApp/FreeTube synced 2024-12-14 21:50:50 +01:00
Code Issues Projects Releases Wiki Activity

Fix some web issues and cleanup (#2582)

Browse Source
This commit is contained in:
absidue 2022-09-17 10:19:31 +02:00 committed by GitHub
parent 84b683089d
commit f2d2827e0f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 25 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/renderer/components/watch-video-playlist/watch-video-playlist.js
View File

@ -82,17 +82,10 @@ export default Vue.extend({
}
},
mounted: function () {
if (!process.env.IS_ELECTRON) {
if (!process.env.IS_ELECTRON || this.backendPreference === 'invidious') {
this.getPlaylistInformationInvidious()
} else {
switch (this.backendPreference) {
case 'local':
this.getPlaylistInformationLocal()
break
case 'invidious':
this.getPlaylistInformationInvidious()
break
}
this.getPlaylistInformationLocal()
}
if ('mediaSession' in navigator) {

38
src/renderer/views/Channel/Channel.js
View File

@ -181,20 +181,13 @@ export default Vue.extend({
this.apiUsed = ''
this.isLoading = true
if (!process.env.IS_ELECTRON) {
this.getVideoInformationInvidious()
if (!process.env.IS_ELECTRON || this.backendPreference === 'invidious') {
this.getChannelInfoInvidious()
this.getPlaylistsInvidious()
} else {
switch (this.backendPreference) {
case 'local':
this.getChannelInfoLocal()
this.getChannelVideosLocal()
this.getPlaylistsLocal()
break
case 'invidious':
this.getChannelInfoInvidious()
this.getPlaylistsInvidious()
break
}
this.getChannelInfoLocal()
this.getChannelVideosLocal()
this.getPlaylistsLocal()
}
},
@ -237,20 +230,13 @@ export default Vue.extend({
this.currentTab = this.$route.params.currentTab ?? 'videos'
this.isLoading = true
if (!process.env.IS_ELECTRON) {
this.getVideoInformationInvidious()
if (!process.env.IS_ELECTRON || this.backendPreference === 'invidious') {
this.getChannelInfoInvidious()
this.getPlaylistsInvidious()
} else {
switch (this.backendPreference) {
case 'local':
this.getChannelInfoLocal()
this.getChannelVideosLocal()
this.getPlaylistsLocal()
break
case 'invidious':
this.getChannelInfoInvidious()
this.getPlaylistsInvidious()
break
}
this.getChannelInfoLocal()
this.getChannelVideosLocal()
this.getPlaylistsLocal()
}
},
methods: {

4
src/renderer/views/Settings/Settings.vue
View File

@ -7,7 +7,7 @@
<player-settings />
<hr>
<external-player-settings v-if="usingElectron" />
<hr>
<hr v-if="usingElectron">
<subscription-settings />
<hr>
<distraction-settings />
@ -19,7 +19,7 @@
<proxy-settings />
<hr>
<download-settings v-if="usingElectron" />
<hr>
<hr v-if="usingElectron">
<parental-control-settings />
<hr>
<sponsor-block-settings />

17
src/renderer/views/Trending/Trending.js
View File

@ -97,17 +97,10 @@ export default Vue.extend({
},
getTrendingInfo () {
if (!process.env.IS_ELECTRON) {
this.getVideoInformationInvidious()
if (!process.env.IS_ELECTRON || this.backendPreference === 'invidious') {
this.getTrendingInfoInvidious()
} else {
switch (this.backendPreference) {
case 'local':
this.getTrendingInfoLocal()
break
case 'invidious':
this.getTrendingInfoInvidious()
break
}
this.getTrendingInfoLocal()
}
},
@ -142,7 +135,7 @@ export default Vue.extend({
navigator.clipboard.writeText(err)
}
})
if (!process.env.IS_ELECTRON || (this.backendPreference === 'local' && this.backendFallback)) {
if (this.backendPreference === 'local' && this.backendFallback) {
this.showToast({
message: this.$t('Falling back to Invidious API')
})
@ -202,7 +195,7 @@ export default Vue.extend({
}
})
if (!process.env.IS_ELECTRON || (this.backendPreference === 'invidious' && this.backendFallback)) {
if (process.env.IS_ELECTRON && (this.backendPreference === 'invidious' && this.backendFallback)) {
this.showToast({
message: this.$t('Falling back to Local API')
})

15
src/renderer/views/Watch/Watch.js
View File

@ -218,17 +218,10 @@ export default Vue.extend({
this.checkIfPlaylist()
this.checkIfTimestamp()
if (!process.env.IS_ELECTRON) {
if (!process.env.IS_ELECTRON || this.backendPreference === 'invidious') {
this.getVideoInformationInvidious()
} else {
switch (this.backendPreference) {
case 'local':
this.getVideoInformationLocal()
break
case 'invidious':
this.getVideoInformationInvidious()
break
}
this.getVideoInformationLocal()
}
window.addEventListener('beforeunload', this.handleWatchProgress)
@ -588,7 +581,7 @@ export default Vue.extend({
}
})
console.log(err)
if (!process.env.IS_ELECTRON || (this.backendPreference === 'local' && this.backendFallback && !err.toString().includes('private'))) {
if (this.backendPreference === 'local' && this.backendFallback && !err.toString().includes('private')) {
this.showToast({
message: this.$t('Falling back to Invidious API')
})
@ -1151,7 +1144,7 @@ export default Vue.extend({
let url = `${this.currentInvidiousInstance}/api/manifest/dash/id/${this.videoId}`
if (this.proxyVideos || !process.env.IS_ELECTRON) {
url = url + '?local=true'
url += '?local=true'
}
return [