Merge pull request #1450 from webtorrent/reuse-media-extensions

Reuse media extensions
webtorrent · Aug 15, 2018 · 109accd · 109accd
2 parents cbbc61d + 8749135
commit 109accd
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 34 deletions.
diff --git a/src/renderer/lib/media-extensions.js b/src/renderer/lib/media-extensions.js
@@ -0,0 +1,11 @@
+const mediaExtensions = {
+  audio: [
+    '.aac', '.asf', '.flac', '.m2a', '.m4a', '.m4b', '.mp2', '.mp4',
+    '.mp3', '.oga', '.ogg', '.opus', '.wma', '.wav', '.wv', '.wvp'],
+  video: [
+    '.avi', '.mp4', '.m4v', '.webm', '.mov', '.mkv', 'mpg', 'mpeg',
+    '.ogv', '.webm', '.wmv'],
+  image: ['.gif', '.jpg', '.jpeg', '.png']
+}
+
+module.exports = mediaExtensions
diff --git a/src/renderer/lib/torrent-player.js b/src/renderer/lib/torrent-player.js
@@ -8,6 +8,8 @@ module.exports = {
 
 const path = require('path')
 
+const mediaExtensions = require('./media-extensions')
+
 // Checks whether a fileSummary or file path is audio/video that we can play,
 // based on the file extension
 function isPlayable (file) {
@@ -16,36 +18,12 @@ function isPlayable (file) {
 
 // Checks whether a fileSummary or file path is playable video
 function isVideo (file) {
-  return [
-    '.avi',
-    '.m4v',
-    '.mkv',
-    '.mov',
-    '.mp4',
-    '.mpg',
-    '.ogv',
-    '.webm',
-    '.wmv'
-  ].includes(getFileExtension(file))
+  return mediaExtensions.video.includes(getFileExtension(file))
 }
 
 // Checks whether a fileSummary or file path is playable audio
 function isAudio (file) {
-  return [
-    '.aac',
-    '.aiff',
-    '.ape',
-    '.ac3',
-    '.flac',
-    '.m4a',
-    '.mp2',
-    '.mp3',
-    '.oga',
-    '.ogg',
-    '.opus',
-    '.wav',
-    '.wma'
-  ].includes(getFileExtension(file))
+  return mediaExtensions.audio.includes(getFileExtension(file))
 }
 
 // Checks if the argument is either:

diff --git a/src/renderer/lib/torrent-poster.js b/src/renderer/lib/torrent-poster.js
@@ -3,14 +3,7 @@ module.exports = torrentPoster
 const captureFrame = require('capture-frame')
 const path = require('path')
 
-const mediaExtensions = {
-  audio: [
-    '.aac', '.asf', '.flac', '.m2a', '.m4a', '.m4b', '.mp2', '.mp4',
-    '.mp3', '.oga', '.ogg', '.opus', '.wma', '.wav', '.wv', '.wvp'
-  ],
-  video: ['.mp4', '.m4v', '.webm', '.mov', '.mkv'],
-  image: ['.gif', '.jpg', '.jpeg', '.png']
-}
+const mediaExtensions = require('./media-extensions')
 
 function torrentPoster (torrent, cb) {
   // First, try to use a poster image if available