Merge branch 'master' into sqlite

client/plugins/constants.js

@@ -1,6 +1,6 @@
 const SupportedFileTypes = {
   image: ['png', 'jpg', 'jpeg', 'webp'],
-  audio: ['m4b', 'mp3', 'm4a', 'flac', 'opus', 'ogg', 'oga', 'mp4', 'aac', 'wma', 'aiff', 'wav', 'webm', 'webma', 'mka'],
+  audio: ['m4b', 'mp3', 'm4a', 'flac', 'opus', 'ogg', 'oga', 'mp4', 'aac', 'wma', 'aiff', 'wav', 'webm', 'webma', 'mka', 'awb'],
   ebook: ['epub', 'pdf', 'mobi', 'azw3', 'cbr', 'cbz'],
   info: ['nfo'],
   text: ['txt'],

server/objects/PodcastEpisodeDownload.js

@@ -1,6 +1,7 @@
 const Path = require('path')
 const { getId } = require('../utils/index')
 const { sanitizeFilename } = require('../utils/fileUtils')
+const globals = require('../utils/globals')
 
 class PodcastEpisodeDownload {
   constructor() {
@@ -40,8 +41,14 @@ class PodcastEpisodeDownload {
     }
   }
 
+  get fileExtension() {
+    const extname = Path.extname(this.url).substring(1).toLowerCase()
+    if (globals.SupportedAudioTypes.includes(extname)) return extname
+    return 'mp3'
+  }
+
   get targetFilename() {
-    return sanitizeFilename(`${this.podcastEpisode.title}.mp3`)
+    return sanitizeFilename(`${this.podcastEpisode.title}.${this.fileExtension}`)
   }
   get targetPath() {
     return Path.join(this.libraryItem.path, this.targetFilename)

server/objects/Stream.js

@@ -82,7 +82,8 @@ class Stream extends EventEmitter {
       AudioMimeType.WMA,
       AudioMimeType.AIFF,
       AudioMimeType.WEBM,
-      AudioMimeType.WEBMA
+      AudioMimeType.WEBMA,
+      AudioMimeType.AWB
     ]
   }
   get codecsToForceAAC() {

server/utils/constants.js

@@ -47,7 +47,8 @@ module.exports.AudioMimeType = {
   AIFF: 'audio/x-aiff',
   WEBM: 'audio/webm',
   WEBMA: 'audio/webm',
-  MKA: 'audio/x-matroska'
+  MKA: 'audio/x-matroska',
+  AWB: 'audio/amr-wb'
 }
 
 module.exports.VideoMimeType = {

server/utils/globals.js

@@ -1,6 +1,6 @@
 const globals = {
   SupportedImageTypes: ['png', 'jpg', 'jpeg', 'webp'],
-  SupportedAudioTypes: ['m4b', 'mp3', 'm4a', 'flac', 'opus', 'ogg', 'oga', 'mp4', 'aac', 'wma', 'aiff', 'wav', 'webm', 'webma', 'mka'],
+  SupportedAudioTypes: ['m4b', 'mp3', 'm4a', 'flac', 'opus', 'ogg', 'oga', 'mp4', 'aac', 'wma', 'aiff', 'wav', 'webm', 'webma', 'mka', 'awb'],
   SupportedEbookTypes: ['epub', 'pdf', 'mobi', 'azw3', 'cbr', 'cbz'],
   SupportedVideoTypes: ['mp4'],
   TextFileTypes: ['txt', 'nfo'],

server/utils/parsers/parseNameString.js

@@ -43,6 +43,8 @@ module.exports.parse = (nameString) => {
   // Example &LF: Friedman, Milton & Friedman, Rose
   if (nameString.includes('&')) {
     nameString.split('&').forEach((asa) => splitNames = splitNames.concat(asa.split(',')))
+  } else if (nameString.includes(';')) {
+    nameString.split(';').forEach((asa) => splitNames = splitNames.concat(asa.split(',')))
   } else {
     splitNames = nameString.split(',')
   }