Compare commits

..

3 Commits

Author SHA1 Message Date
Gilles De Mey
86baea3b0e fix app not being interactive on MacOS 2024-03-29 16:58:43 +01:00
Herwig Hochleitner
0c3e55d1f0 update: electron 27 + related latest 2023-10-28 02:10:19 +02:00
Herwig Hochleitner
5751a9bcb7 fix startup errors on electron 26 2023-10-28 01:00:39 +02:00
5 changed files with 2013 additions and 2072 deletions

View File

@@ -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://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://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/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>

4025
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@@ -21,7 +21,7 @@
"url": "https://github.com/webtorrent/webtorrent-desktop/issues"
},
"dependencies": {
"@electron/remote": "2.1.2",
"@electron/remote": "2.0.11",
"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": "^10.3.0",
"music-metadata": "7.13.4",
"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.24.8",
"@babel/core": "7.25.2",
"@babel/eslint-parser": "7.25.1",
"@babel/plugin-transform-react-jsx": "7.25.2",
"@babel/cli": "7.22.15",
"@babel/core": "7.22.15",
"@babel/eslint-parser": "7.22.15",
"@babel/plugin-transform-react-jsx": "7.22.15",
"cross-zip": "4.0.0",
"depcheck": "1.4.7",
"electron": "27.3.11",
"depcheck": "1.4.5",
"electron": "27.0.2",
"electron-notarize": "1.2.2",
"electron-osx-sign": "0.6.0",
"electron-packager": "17.1.2",
"electron-winstaller": "5.4.0",
"electron-winstaller": "5.1.2",
"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.8.1"
"tape": "5.6.6"
},
"engines": {
"node": "^16.0.0 || ^18.0.0",
"npm": "^7.10.0 || ^8.0.0 || ^9.0.0 || ^10.0.0"
"npm": "^7.10.0 || ^8.0.0 || ^9.0.0"
},
"homepage": "https://webtorrent.io",
"keywords": [

View File

@@ -6,7 +6,7 @@ const crypto = require('crypto')
const util = require('util')
const { ipcRenderer } = require('electron')
const fs = require('fs')
const { loadMusicMetadata } = require('music-metadata')
const mm = require('music-metadata')
const networkAddress = require('network-address')
const path = require('path')
const WebTorrent = require('webtorrent')
@@ -345,23 +345,25 @@ 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)
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
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
)
}
)
})
}
function selectFiles (torrentOrInfoHash, selections) {

View File

@@ -70,7 +70,7 @@ table {
}
.app {
-webkit-user-select: none;
user-select: none;
height: 100%;
display: flex;
flex-flow: column;