Merge pull request #4596 from renesat/fix/redirect-url

Fix freeze on some audio sources

client/components/modals/podcast/RemoveEpisode.vue

@@ -94,7 +94,6 @@ export default {
       }
 
       this.processing = false
-      this.$toast.success(`${this.episodes.length} episode${this.episodes.length > 1 ? 's' : ''} removed`)
       this.show = false
       this.$emit('clearSelected')
     }

client/components/modals/podcast/tabs/EpisodeMatch.vue

@@ -114,7 +114,7 @@ export default {
         .$patch(`/api/podcasts/${this.libraryItem.id}/episode/${this.episodeId}`, updatePayload)
         .then(() => {
           this.isProcessing = false
-          this.$toast.success('Podcast episode updated')
+          this.$toast.success(this.$strings.ToastPodcastEpisodeUpdated)
           this.$emit('selectTab', 'details')
         })
         .catch((error) => {

client/strings/en-us.json

@@ -1096,6 +1096,7 @@
   "ToastPlaylistUpdateSuccess": "Playlist updated",
   "ToastPodcastCreateFailed": "Failed to create podcast",
   "ToastPodcastCreateSuccess": "Podcast created successfully",
+  "ToastPodcastEpisodeUpdated": "Episode updated",
   "ToastPodcastGetFeedFailed": "Failed to get podcast feed",
   "ToastPodcastNoEpisodesInFeed": "No episodes found in RSS feed",
   "ToastPodcastNoRssFeed": "Podcast does not have an RSS feed",

server/objects/Stream.js

@@ -146,7 +146,7 @@ class Stream extends EventEmitter {
 
   async generatePlaylist() {
     await fs.ensureDir(this.streamPath)
-    await hlsPlaylistGenerator(this.playlistPath, 'output', this.totalDuration, this.segmentLength, this.hlsSegmentType, this.userToken)
+    await hlsPlaylistGenerator(this.playlistPath, 'output', this.totalDuration, this.segmentLength, this.hlsSegmentType)
     return this.clientPlaylistUri
   }
 

server/utils/ffmpegHelpers.js

@@ -118,6 +118,7 @@ module.exports.downloadPodcastEpisode = (podcastEpisodeDownload) => {
           method: 'GET',
           responseType: 'stream',
           headers: {
+            'Accept': '*/*',
             'User-Agent': userAgent
           },
           timeout: global.PodcastDownloadTimeout

server/utils/generators/hlsPlaylistGenerator.js

@@ -1,6 +1,6 @@
 const fs = require('../../libs/fsExtra')
 
-function getPlaylistStr(segmentName, duration, segmentLength, hlsSegmentType, token) {
+function getPlaylistStr(segmentName, duration, segmentLength, hlsSegmentType) {
   var ext = hlsSegmentType === 'fmp4' ? 'm4s' : 'ts'
 
   var lines = [
@@ -18,18 +18,18 @@ function getPlaylistStr(segmentName, duration, segmentLength, hlsSegmentType, to
   var lastSegment = duration - (numSegments * segmentLength)
   for (let i = 0; i < numSegments; i++) {
     lines.push(`#EXTINF:6,`)
-    lines.push(`${segmentName}-${i}.${ext}?token=${token}`)
+    lines.push(`${segmentName}-${i}.${ext}`)
   }
   if (lastSegment > 0) {
     lines.push(`#EXTINF:${lastSegment},`)
-    lines.push(`${segmentName}-${numSegments}.${ext}?token=${token}`)
+    lines.push(`${segmentName}-${numSegments}.${ext}`)
   }
   lines.push('#EXT-X-ENDLIST')
   return lines.join('\n')
 }
 
-function generatePlaylist(outputPath, segmentName, duration, segmentLength, hlsSegmentType, token) {
+function generatePlaylist(outputPath, segmentName, duration, segmentLength, hlsSegmentType) {
-  var playlistStr = getPlaylistStr(segmentName, duration, segmentLength, hlsSegmentType, token)
+  var playlistStr = getPlaylistStr(segmentName, duration, segmentLength, hlsSegmentType)
   return fs.writeFile(outputPath, playlistStr)
 }
 module.exports = generatePlaylist