Compare commits
21 Commits
electron-2
...
update-to-
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
451212c7ae | ||
|
|
9ba088f76f | ||
|
|
1a7404ee8a | ||
|
|
f1de7606a5 | ||
|
|
d4b493cebe | ||
|
|
1df3d025bd | ||
|
|
61b7681fd1 | ||
|
|
ac7f16e71c | ||
|
|
b363dca77f | ||
|
|
16cabd19ff | ||
|
|
390b4ad7ec | ||
|
|
b3dc3292b7 | ||
|
|
244a242bdc | ||
|
|
241f3cb9a3 | ||
|
|
aa4fb3d08e | ||
|
|
ebaf9cf848 | ||
|
|
df05db5583 | ||
|
|
1ccfa404d2 | ||
|
|
bc19caf8ee | ||
|
|
36c24a4940 | ||
|
|
1cefcff3da |
@@ -13,7 +13,7 @@
|
||||
|
||||
<p align="center">
|
||||
<a href="https://discord.gg/cnXkm4Z"><img src="https://img.shields.io/discord/612575111718895616" alt="discord"></a>
|
||||
<a href="https://travis-ci.org/webtorrent/webtorrent-desktop"><img src="https://img.shields.io/travis/webtorrent/webtorrent-desktop/master.svg" alt="travis"></a>
|
||||
<a href="https://github.com/webtorrent/webtorrent-desktop/actions/workflows/ci.yml"><img src="https://github.com/webtorrent/webtorrent-desktop/actions/workflows/ci.yml/badge.svg" alt="GitHub CI action"></a>
|
||||
<a href="https://github.com/webtorrent/webtorrent-desktop/releases"><img src="https://img.shields.io/github/release/webtorrent/webtorrent-desktop.svg" alt="github release version"></a>
|
||||
<a href="https://github.com/webtorrent/webtorrent-desktop/releases"><img src="https://img.shields.io/github/downloads/webtorrent/webtorrent-desktop/total.svg" alt="github release downloads"></a>
|
||||
<a href="https://standardjs.com"><img src="https://img.shields.io/badge/code_style-standard-brightgreen.svg" alt="Standard - JavaScript Style Guide"></a>
|
||||
|
||||
5894
package-lock.json
generated
5894
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
28
package.json
28
package.json
@@ -21,7 +21,7 @@
|
||||
"url": "https://github.com/webtorrent/webtorrent-desktop/issues"
|
||||
},
|
||||
"dependencies": {
|
||||
"@electron/remote": "2.0.11",
|
||||
"@electron/remote": "2.1.2",
|
||||
"airplayer": "github:webtorrent/airplayer#fix-security",
|
||||
"application-config": "2.0.0",
|
||||
"arch": "2.2.0",
|
||||
@@ -40,7 +40,7 @@
|
||||
"languagedetect": "2.0.0",
|
||||
"location-history": "1.1.2",
|
||||
"material-ui": "0.20.2",
|
||||
"music-metadata": "7.13.4",
|
||||
"music-metadata": "^10.3.0",
|
||||
"network-address": "1.1.2",
|
||||
"parse-torrent": "9.1.5",
|
||||
"prettier-bytes": "1.0.4",
|
||||
@@ -58,17 +58,17 @@
|
||||
"winreg": "1.2.4"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@babel/cli": "7.22.15",
|
||||
"@babel/core": "7.22.15",
|
||||
"@babel/eslint-parser": "7.22.15",
|
||||
"@babel/plugin-transform-react-jsx": "7.22.15",
|
||||
"@babel/cli": "7.24.8",
|
||||
"@babel/core": "7.25.2",
|
||||
"@babel/eslint-parser": "7.25.1",
|
||||
"@babel/plugin-transform-react-jsx": "7.25.2",
|
||||
"cross-zip": "4.0.0",
|
||||
"depcheck": "1.4.5",
|
||||
"electron": "15.5.7",
|
||||
"depcheck": "1.4.7",
|
||||
"electron": "27.3.11",
|
||||
"electron-notarize": "1.2.2",
|
||||
"electron-osx-sign": "0.6.0",
|
||||
"electron-packager": "15.5.2",
|
||||
"electron-winstaller": "5.1.0",
|
||||
"electron-packager": "17.1.2",
|
||||
"electron-winstaller": "5.4.0",
|
||||
"gh-release": "7.0.2",
|
||||
"minimist": "1.2.8",
|
||||
"nodemon": "2.0.22",
|
||||
@@ -78,11 +78,11 @@
|
||||
"run-series": "1.1.9",
|
||||
"spectron": "19.0.0",
|
||||
"standard": "17.0.0",
|
||||
"tape": "5.6.6"
|
||||
"tape": "5.8.1"
|
||||
},
|
||||
"engines": {
|
||||
"node": "^16.0.0 || ^18.0.0",
|
||||
"npm": "^7.10.0 || ^8.0.0 || ^9.0.0"
|
||||
"npm": "^7.10.0 || ^8.0.0 || ^9.0.0 || ^10.0.0"
|
||||
},
|
||||
"homepage": "https://webtorrent.io",
|
||||
"keywords": [
|
||||
@@ -99,8 +99,8 @@
|
||||
"main": "index.js",
|
||||
"optionalDependencies": {
|
||||
"appdmg": "^0.6.0",
|
||||
"electron-installer-debian": "^3.1.0",
|
||||
"electron-installer-redhat": "^3.3.0"
|
||||
"electron-installer-debian": "^3.2.0",
|
||||
"electron-installer-redhat": "^3.4.0"
|
||||
},
|
||||
"private": true,
|
||||
"productName": "WebTorrent",
|
||||
|
||||
@@ -91,11 +91,11 @@ function init (state, options) {
|
||||
})
|
||||
|
||||
win.on('move', debounce(e => {
|
||||
send('windowBoundsChanged', e.sender.getBounds())
|
||||
send('windowBoundsChanged', main.win.getBounds())
|
||||
}, 1000))
|
||||
|
||||
win.on('resize', debounce(e => {
|
||||
send('windowBoundsChanged', e.sender.getBounds())
|
||||
send('windowBoundsChanged', main.win.getBounds())
|
||||
}, 1000))
|
||||
|
||||
win.on('close', e => {
|
||||
|
||||
@@ -6,7 +6,7 @@ const crypto = require('crypto')
|
||||
const util = require('util')
|
||||
const { ipcRenderer } = require('electron')
|
||||
const fs = require('fs')
|
||||
const mm = require('music-metadata')
|
||||
const { loadMusicMetadata } = require('music-metadata')
|
||||
const networkAddress = require('network-address')
|
||||
const path = require('path')
|
||||
const WebTorrent = require('webtorrent')
|
||||
@@ -345,25 +345,23 @@ function getAudioMetadata (infoHash, index) {
|
||||
})
|
||||
}
|
||||
}
|
||||
const onMetadata = file.done
|
||||
// If completed; use direct file access
|
||||
? mm.parseFile(path.join(torrent.path, file.path), options)
|
||||
// otherwise stream
|
||||
: mm.parseStream(file.createReadStream(), file.name, options)
|
||||
|
||||
onMetadata
|
||||
.then(
|
||||
metadata => {
|
||||
ipcRenderer.send('wt-audio-metadata', infoHash, index, metadata)
|
||||
console.log(`metadata for file='${file.name}' completed.`)
|
||||
},
|
||||
err => {
|
||||
console.log(
|
||||
`error getting audio metadata for ${infoHash}:${index}`,
|
||||
err
|
||||
)
|
||||
}
|
||||
loadMusicMetadata(mm => {
|
||||
return file.done
|
||||
// If completed; use direct file access
|
||||
? mm.parseFile(path.join(torrent.path, file.path), options)
|
||||
// otherwise stream
|
||||
: mm.parseStream(file.createReadStream(), file.name, options)
|
||||
}).then(metadata => {
|
||||
ipcRenderer.send('wt-audio-metadata', infoHash, index, metadata)
|
||||
console.log(`metadata for file='${file.name}' completed.`)
|
||||
},
|
||||
err => {
|
||||
console.log(
|
||||
`error getting audio metadata for ${infoHash}:${index}`,
|
||||
err
|
||||
)
|
||||
})
|
||||
}
|
||||
|
||||
function selectFiles (torrentOrInfoHash, selections) {
|
||||
|
||||
@@ -71,7 +71,6 @@ table {
|
||||
|
||||
.app {
|
||||
-webkit-user-select: none;
|
||||
-webkit-app-region: drag;
|
||||
height: 100%;
|
||||
display: flex;
|
||||
flex-flow: column;
|
||||
@@ -143,6 +142,7 @@ table {
|
||||
*/
|
||||
|
||||
.header {
|
||||
-webkit-app-region: drag;
|
||||
background: rgb(40, 40, 40);
|
||||
border-bottom: 1px solid rgb(30, 30, 30);
|
||||
height: 38px; /* vertically center OS menu buttons (OS X) */
|
||||
|
||||
Reference in New Issue
Block a user