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

OS X: open magnet links in WebTorrent

Browse Source
This commit is contained in:
Feross Aboukhadijeh
2016-03-19 17:09:05 -07:00
parent 6b6d1ee1c7
commit 0f263b89e5
3 changed files with 26 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
bin/package.js
View File

@@ -167,6 +167,15 @@ function buildDarwin (cb) {
} }
] ]
infoPlist.CFBundleURLTypes = [
{
CFBundleTypeRole: 'Editor',
CFBundleURLIconFile: 'WebTorrentFile.icns',
CFBundleURLName: 'BitTorrent Magnet URL',
CFBundleURLSchemes: [ 'magnet' ]
}
]
infoPlist.NSHumanReadableCopyright = 'Copyright © 2014-2016 The WebTorrent Project' infoPlist.NSHumanReadableCopyright = 'Copyright © 2014-2016 The WebTorrent Project'
fs.writeFileSync(infoPlistPath, plist.build(infoPlist)) fs.writeFileSync(infoPlistPath, plist.build(infoPlist))

10
main/index.js
View File

@@ -40,13 +40,13 @@ ipc.init()
function onOpen (e, torrentId) { function onOpen (e, torrentId) {
e.preventDefault() e.preventDefault()
console.log(app.ipcReady)
if (app.ipcReady) { if (app.ipcReady) {
openFiles() onReadyOpen()
} else { } else {
app.on('ipcReady', openFiles) app.on('ipcReady', onReadyOpen)
} }
function openFiles () { function onReadyOpen () {
windows.main.send('dispatch', 'openFiles', torrentId) windows.main.send('dispatch', 'onOpen', torrentId)
windows.main.focus()
} }
} }

23
renderer/index.js
View File

@@ -87,7 +87,7 @@ function init () {
Cast.init(update) Cast.init(update)
// ...drag and drop a torrent or video file to play or seed // ...drag and drop a torrent or video file to play or seed
dragDrop('body', (files) => dispatch('openFiles', files)) dragDrop('body', (files) => dispatch('onOpen', files))
// ...same thing if you paste a torrent // ...same thing if you paste a torrent
document.addEventListener('paste', onPaste) document.addEventListener('paste', onPaste)
@@ -157,8 +157,8 @@ function dispatch (action, ...args) {
if (['videoMouseMoved', 'playbackJump'].indexOf(action) < 0) { if (['videoMouseMoved', 'playbackJump'].indexOf(action) < 0) {
console.log('dispatch: %s %o', action, args) /* log user interactions, but don't spam */ console.log('dispatch: %s %o', action, args) /* log user interactions, but don't spam */
} }
if (action === 'openFiles') { if (action === 'onOpen') {
openFiles(args[0] /* files */) onOpen(args[0] /* files */)
} }
if (action === 'addTorrent') { if (action === 'addTorrent') {
addTorrent(args[0] /* torrent */) addTorrent(args[0] /* torrent */)
@@ -324,16 +324,16 @@ function updateClientProgress () {
state.dock.progress = progress state.dock.progress = progress
} }
function openFiles (files) { function onOpen (files) {
if (!Array.isArray(files)) files = [ files ] if (!Array.isArray(files)) files = [ files ]
// .torrent file = start downloading the torrent // .torrent file = start downloading the torrent
files.filter(isTorrentFile).forEach(function (torrentFile) { files.filter(isTorrent).forEach(function (torrentFile) {
addTorrent(torrentFile) addTorrent(torrentFile)
}) })
// everything else = seed these files // everything else = seed these files
seed(files.filter(isNotTorrentFile)) seed(files.filter(isNotTorrent))
} }
function onPaste (e) { function onPaste (e) {
@@ -347,14 +347,15 @@ function onPaste (e) {
}) })
} }
function isTorrentFile (file) { function isTorrent (file) {
var name = typeof file === 'string' ? file : file.name var name = typeof file === 'string' ? file : file.name
var extname = path.extname(name).toLowerCase() var isTorrentFile = path.extname(name).toLowerCase() === '.torrent'
return extname === '.torrent' var isMagnet = typeof file === 'string' && /^magnet:/.test(file)
return isTorrentFile || isMagnet
} }
function isNotTorrentFile (file) { function isNotTorrent (file) {
return !isTorrentFile(file) return !isTorrent(file)
} }
// Gets a torrent summary {name, infoHash, status} from state.saved.torrents // Gets a torrent summary {name, infoHash, status} from state.saved.torrents