kalugin66/webtorrent-desktop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1514 from webtorrent/greenkeeper/music-metadata-3.2.2

Browse Source 
Greenkeeper/music metadata 3.3.0
This commit is contained in:
Borewit
2018-12-17 21:36:59 +01:00
committed by GitHub
parent a56e14f0a0 cdf5c5364a
commit 170fd28c55
3 changed files with 37 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
package-lock.json generated
View File

@@ -1056,7 +1056,7 @@
},
"bl": {
"version": "1.1.2",
"resolved": "https://registry.npmjs.org/bl/-/bl-1.1.2.tgz",
"resolved": "http://registry.npmjs.org/bl/-/bl-1.1.2.tgz",
"integrity": "sha1-/cqHGplxOqANGeO7ukHER4emU5g=",
"dev": true,
"requires": {
@@ -3358,7 +3358,7 @@
"dependencies": {
"asar": {
"version": "0.11.0",
"resolved": "https://registry.npmjs.org/asar/-/asar-0.11.0.tgz",
"resolved": "http://registry.npmjs.org/asar/-/asar-0.11.0.tgz",
"integrity": "sha1-uSbnksMV+MBIxDNx4yWwnJenZGQ=",
"dev": true,
"requires": {
@@ -4007,9 +4007,9 @@
}
},
"file-type": {
"version": "9.0.0",
"resolved": "https://registry.npmjs.org/file-type/-/file-type-9.0.0.tgz",
"integrity": "sha512-Qe/5NJrgIOlwijpq3B7BEpzPFcgzggOTagZmkXQY4LA6bsXKTUstK7Wp12lEJ/mLKTpvIZxmIuRcLYWT6ov9lw=="
"version": "10.6.0",
"resolved": "https://registry.npmjs.org/file-type/-/file-type-10.6.0.tgz",
"integrity": "sha512-GNOg09GC+rZzxetGZFoL7QOnWXRqvWuEdKURIJlr0d6MW107Iwy6voG1PPOrm5meG6ls59WkBmBMAZdVSVajRQ=="
},
"filestream": {
"version": "4.1.3",
@@ -4329,7 +4329,7 @@
},
"get-stream": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
"resolved": "http://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
"integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=",
"dev": true
},
@@ -4393,7 +4393,7 @@
"dependencies": {
"async": {
"version": "0.9.2",
"resolved": "https://registry.npmjs.org/async/-/async-0.9.2.tgz",
"resolved": "http://registry.npmjs.org/async/-/async-0.9.2.tgz",
"integrity": "sha1-rqdNXmHB+JlhO/ZL2mbUx48v0X0=",
"dev": true
},
@@ -4881,7 +4881,8 @@
"imul": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/imul/-/imul-1.0.1.tgz",
"integrity": "sha1-nVhnFh6LPelsLDjV3HyxAvNeKsk="
"integrity": "sha1-nVhnFh6LPelsLDjV3HyxAvNeKsk=",
"optional": true
},
"imurmurhash": {
"version": "0.1.4",
@@ -5443,7 +5444,8 @@
"is-property": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz",
"integrity": "sha1-V/4cTkhHTt1lsJkR8msc1Ald2oQ="
"integrity": "sha1-V/4cTkhHTt1lsJkR8msc1Ald2oQ=",
"optional": true
},
"is-redirect": {
"version": "1.0.0",
@@ -6372,16 +6374,15 @@
}
},
"music-metadata": {
"version": "3.1.0",
"resolved": "https://registry.npmjs.org/music-metadata/-/music-metadata-3.1.0.tgz",
"integrity": "sha512-VBYJ+BLUHT2VIR5YZ5A9bHSU3aQoDlFM2Og+B9t5P1KgFue6QS79kIO3u/6T9lts6aO+V8TrCZTk2w60/hMpYQ==",
"version": "3.3.0",
"resolved": "https://registry.npmjs.org/music-metadata/-/music-metadata-3.3.0.tgz",
"integrity": "sha512-b5My8m7R2DyrOKlHGOyXva73gRsnJbZi6Sq427fPJjQ7OxiU8xS56Q9d16KEOwr0XLKALWW3fI8zMce5SM71ag==",
"requires": {
"debug": "^4.0.1",
"file-type": "9",
"media-typer": "^0.3.0",
"strtok3": "^2.1.0",
"then-read-stream": "^1.3.0",
"token-types": "^1.0.0"
"debug": "^4.1.0",
"file-type": "^10.5.0",
"media-typer": "0.3.0",
"strtok3": "^2.3.0",
"token-types": "^1.0.1"
},
"dependencies": {
"debug": {
@@ -6408,7 +6409,8 @@
"nan": {
"version": "2.11.0",
"resolved": "https://registry.npmjs.org/nan/-/nan-2.11.0.tgz",
"integrity": "sha512-F4miItu2rGnV2ySkXOQoA8FKz/SR2Q2sWP0sbTxNxz/tuokeC8WxOhPMcwi0qIyGtVn/rrSeLbvVkznqCdwYnw=="
"integrity": "sha512-F4miItu2rGnV2ySkXOQoA8FKz/SR2Q2sWP0sbTxNxz/tuokeC8WxOhPMcwi0qIyGtVn/rrSeLbvVkznqCdwYnw==",
"optional": true
},
"nan-x": {
"version": "1.0.2",
@@ -7034,7 +7036,8 @@
"path-key": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/path-key/-/path-key-1.0.0.tgz",
"integrity": "sha1-XVPVeAGWRsDWiADbThRua9wqx68="
"integrity": "sha1-XVPVeAGWRsDWiADbThRua9wqx68=",
"optional": true
},
"path-parse": {
"version": "1.0.6",
@@ -7507,7 +7510,7 @@
},
"rcedit": {
"version": "0.7.0",
"resolved": "http://registry.npmjs.org/rcedit/-/rcedit-0.7.0.tgz",
"resolved": "https://registry.npmjs.org/rcedit/-/rcedit-0.7.0.tgz",
"integrity": "sha1-VgspIBZQNKE1MW5qER+CdLnOxSE=",
"dev": true
},
@@ -8991,7 +8994,7 @@
},
"strip-ansi": {
"version": "3.0.1",
"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
"resolved": "http://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
"integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
"requires": {
"ansi-regex": "^2.0.0"
@@ -9025,12 +9028,12 @@
"dev": true
},
"strtok3": {
"version": "2.2.0",
"resolved": "https://registry.npmjs.org/strtok3/-/strtok3-2.2.0.tgz",
"integrity": "sha512-84LuJQBO2GTW71Vr3iCjUoxik9F2cGj5gfuux6eKQgTWfwptMVYJ83yBGBDEtAp0dy+Hncl4ZRZ+D4IZC539gg==",
"version": "2.3.0",
"resolved": "https://registry.npmjs.org/strtok3/-/strtok3-2.3.0.tgz",
"integrity": "sha512-AA67/1atBh7X0fUTDevjW89by2ZkY9RZAnkwusx5Yc1COYf0ruUbpYOOIs03SnRA1CF9K3+BtRXKOEtKhAXVaQ==",
"requires": {
"debug": "^4.1.0",
"then-read-stream": "^1.4.0",
"then-read-stream": "^1.5.0",
"token-types": "^1.0.1"
},
"dependencies": {
@@ -9216,7 +9219,7 @@
"dependencies": {
"resolve": {
"version": "1.7.1",
"resolved": "http://registry.npmjs.org/resolve/-/resolve-1.7.1.tgz",
"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.7.1.tgz",
"integrity": "sha512-c7rwLofp8g1U+h1KNyHL/jicrKg1Ek4q+Lr33AL65uZTinUZHe30D5HlyN5V9NW0JX1D5dXQ4jqW5l7Sy/kGfw==",
"dev": true,
"requires": {
@@ -9306,9 +9309,9 @@
"dev": true
},
"then-read-stream": {
"version": "1.4.0",
"resolved": "https://registry.npmjs.org/then-read-stream/-/then-read-stream-1.4.0.tgz",
"integrity": "sha512-jwlUR0ZMm1h73XhB+NI/lizrQrwL1f6J3H/GRCuluSxxKrJEW/HuFG0g4I8bK2LjlXitAZKMrZa7Yh5cLp86EQ=="
"version": "1.5.0",
"resolved": "https://registry.npmjs.org/then-read-stream/-/then-read-stream-1.5.0.tgz",
"integrity": "sha512-Qu+Dp3G28GBmewssIjoRwcmdnsymjdSFt17s8qAajQKesBjLoRAj3VgWftiLSC5CJV6PEYOS0d45WGTJp8QFxQ=="
},
"thirty-two": {
"version": "1.0.2",

2
package.json
View File

@@ -32,7 +32,7 @@
"location-history": "^1.0.0",
"material-ui": "^0.20.2",
"mkdirp": "^0.5.1",
"music-metadata": "^3.1.0",
"music-metadata": "^3.3.0",
"network-address": "^1.1.0",
"parse-torrent": "^6.0.1",
"prettier-bytes": "^1.0.1",

5
src/renderer/lib/media-extensions.js
View File

@@ -1,7 +1,8 @@
const mediaExtensions = {
audio: [
'.aac', '.asf', '.flac', '.m2a', '.m4a', '.m4b', '.mp2', '.mp4',
'.mp3', '.oga', '.ogg', '.opus', '.wma', '.wav', '.wv', '.wvp'],
'.aac', 'aif', 'aiff', '.asf', '.flac', '.m2a', '.m4a', '.m4b',
'.mp2', '.mp3', '.mpc', '.oga', '.ogg', '.opus', 'spx', '.wma',
'.wav', '.wv', '.wvp'],
video: [
'.avi', '.mp4', '.m4v', '.webm', '.mov', '.mkv', 'mpg', 'mpeg',
'.ogv', '.webm', '.wmv'],