Testing video media type

server/utils/constants.js

@@ -44,4 +44,8 @@ module.exports.AudioMimeType = {
   FLAC: 'audio/flac',
   WMA: 'audio/x-ms-wma',
   AIFF: 'audio/x-aiff'
+}
+
+module.exports.VideoMimeType = {
+  MP4: 'video/mp4'
 }

server/utils/globals.js

@@ -2,6 +2,7 @@ const globals = {
   SupportedImageTypes: ['png', 'jpg', 'jpeg', 'webp'],
   SupportedAudioTypes: ['m4b', 'mp3', 'm4a', 'flac', 'opus', 'ogg', 'mp4', 'aac', 'wma', 'aiff'],
   SupportedEbookTypes: ['epub', 'pdf', 'mobi', 'azw3', 'cbr', 'cbz'],
+  SupportedVideoTypes: ['mp4'],
   TextFileTypes: ['txt', 'nfo'],
   MetadataFileTypes: ['opf', 'abs', 'xml']
 }

server/utils/libraryHelpers.js

@@ -85,7 +85,7 @@ module.exports = {
           if (series && !data.series.find(se => se.id === series.id)) data.series.push({ id: series.id, name: series.name })
         })
       }
-      if (mediaMetadata.genres.length) {
+      if (mediaMetadata.genres && mediaMetadata.genres.length) {
         mediaMetadata.genres.forEach((genre) => {
           if (genre && !data.genres.includes(genre)) data.genres.push(genre)
         })
@@ -399,7 +399,7 @@ module.exports = {
             }
           }
         }
-      } else {
+      } else if (libraryItem.isBook) {
         // Book categories
 
         // Newest series

server/utils/prober.js

@@ -1,5 +1,5 @@
 const ffprobe = require('node-ffprobe')
-const AudioProbeData = require('../scanner/AudioProbeData')
+const MediaProbeData = require('../scanner/MediaProbeData')
 
 const Logger = require('../Logger')
 
@@ -274,7 +274,7 @@ function parseProbeData(data, verbose = false) {
   }
 }
 
-// Updated probe returns AudioProbeData object
+// Updated probe returns MediaProbeData object
 function probe(filepath, verbose = false) {
   if (process.env.FFPROBE_PATH) {
     ffprobe.FFPROBE_PATH = process.env.FFPROBE_PATH
@@ -283,12 +283,12 @@ function probe(filepath, verbose = false) {
   return ffprobe(filepath)
     .then(raw => {
       var rawProbeData = parseProbeData(raw, verbose)
-      if (!rawProbeData || !rawProbeData.audio_stream) {
+      if (!rawProbeData || (!rawProbeData.audio_stream && !rawProbeData.video_stream)) {
         return {
-          error: rawProbeData ? 'Invalid audio file: no audio streams found' : 'Probe Failed'
+          error: rawProbeData ? 'Invalid media file: no audio or video streams found' : 'Probe Failed'
         }
       } else {
-        var probeData = new AudioProbeData()
+        var probeData = new MediaProbeData()
         probeData.setData(rawProbeData)
         return probeData
       }

server/utils/scandir.js

@@ -11,6 +11,7 @@ function isMediaFile(mediaType, ext) {
   if (!ext) return false
   var extclean = ext.slice(1).toLowerCase()
   if (mediaType === 'podcast') return globals.SupportedAudioTypes.includes(extclean)
+  else if (mediaType === 'video') return globals.SupportedVideoTypes.includes(extclean)
   return globals.SupportedAudioTypes.includes(extclean) || globals.SupportedEbookTypes.includes(extclean)
 }
 
@@ -72,7 +73,7 @@ module.exports.groupFilesIntoLibraryItemPaths = groupFilesIntoLibraryItemPaths
 function groupFileItemsIntoLibraryItemDirs(mediaType, fileItems) {
   // Step 1: Filter out non-book-media files in root dir (with depth of 0)
   var itemsFiltered = fileItems.filter(i => {
-    return i.deep > 0 || (mediaType === 'book' && isMediaFile(mediaType, i.extension))
+    return i.deep > 0 || ((mediaType === 'book' || mediaType === 'video') && isMediaFile(mediaType, i.extension))
   })
 
   // Step 2: Seperate media files and other files
@@ -136,7 +137,7 @@ function groupFileItemsIntoLibraryItemDirs(mediaType, fileItems) {
 }
 
 function cleanFileObjects(libraryItemPath, files) {
-  return Promise.all(files.map(async(file) => {
+  return Promise.all(files.map(async (file) => {
     var filePath = Path.posix.join(libraryItemPath, file)
     var newLibraryFile = new LibraryFile()
     await newLibraryFile.setDataFromPath(filePath, file)
@@ -314,9 +315,11 @@ function getPodcastDataFromDir(folderPath, relPath) {
 function getDataFromMediaDir(libraryMediaType, folderPath, relPath, serverSettings) {
   if (libraryMediaType === 'podcast') {
     return getPodcastDataFromDir(folderPath, relPath)
-  } else {
+  } else if (libraryMediaType === 'book') {
     var parseSubtitle = !!serverSettings.scannerParseSubtitle
     return getBookDataFromDir(folderPath, relPath, parseSubtitle)
+  } else {
+    return this.getPodcastDataFromDir(folderPath, relPath)
   }
 }
 
@@ -333,10 +336,10 @@ async function getLibraryItemFileData(libraryMediaType, folder, libraryItemPath,
   if (isSingleMediaItem) { // Single media item in root of folder
     fileItems = [
       {
-      fullpath: libraryItemPath,
-      path: libraryItemDir // actually the relPath (only filename here)
-    }
-  ]
+        fullpath: libraryItemPath,
+        path: libraryItemDir // actually the relPath (only filename here)
+      }
+    ]
     libraryItemData = {
       path: libraryItemPath, // full path
       relPath: libraryItemDir, // only filename