Merge pull request #158 from feross/osx-dock

Dock icon should accept all file types

README.md

@@ -60,6 +60,9 @@ $ npm run package -- [platform]
 
 Where `[platform]` is `--darwin`, `--linux`, or `--win32`.
 
+To package a Windows app from non-Windows platforms, [Wine](https://www.winehq.org/) needs
+to be installed. On OS X, it is installable via [Homebrew](http://brew.sh/).
+
 ### Code Style
 
 [![js-standard-style](https://cdn.rawgit.com/feross/standard/master/badge.svg)](https://github.com/feross/standard)

bin/package.js

@@ -153,14 +153,27 @@ function postDarwinism () {
     'static',
     'WebTorrentFile.icns'
   ])
-  var infoPlist = plist.parse(fs.readFileSync(infoPlistPath).toString())
+  var infoPlist = plist.parse(fs.readFileSync(infoPlistPath, 'utf8'))
 
-  infoPlist['CFBundleDocumentTypes'] = [{
+  infoPlist.CFBundleDocumentTypes = [
-    CFBundleTypeExtensions: [ 'torrent' ],
+    {
-    CFBundleTypeName: 'BitTorrent Document',
+      CFBundleTypeExtensions: [ 'torrent' ],
-    CFBundleTypeRole: 'Editor',
+      CFBundleTypeIconFile: 'WebTorrentFile.icns',
-    CFBundleTypeIconFile: 'WebTorrentFile.icns'
+      CFBundleTypeName: 'BitTorrent Document',
-  }]
+      CFBundleTypeRole: 'Editor',
+      LSHandlerRank: 'Owner',
+      LSItemContentTypes: [ 'org.bittorrent.torrent' ]
+    },
+    {
+      CFBundleTypeName: 'Any',
+      CFBundleTypeOSTypes: [ '****' ],
+      CFBundleTypeRole: 'Editor',
+      LSTypeIsPackage: false,
+      LSHandlerRank: 'Owner'
+    }
+  ]
+
+  infoPlist.NSHumanReadableCopyright = 'Copyright © 2014-2016 The WebTorrent Project'
 
   fs.writeFileSync(infoPlistPath, plist.build(infoPlist))
   cp.execSync(`cp ${webTorrentFileIconPath} ${resourcesPath}`)

main/index.js

@@ -42,5 +42,5 @@ ipc.init()
 
 function onOpen (e, torrentId) {
   e.preventDefault()
-  windows.main.send('dispatch', 'addTorrent', torrentId)
+  windows.main.send('dispatch', 'openFiles', torrentId)
 }

renderer/index.js

@@ -88,7 +88,7 @@ function init () {
   Cast.init(update)
 
   // ...drag and drop a torrent or video file to play or seed
-  dragDrop('body', onFiles)
+  dragDrop('body', (files) => dispatch('openFiles', files))
 
   // ...same thing if you paste a torrent
   document.addEventListener('paste', onPaste)
@@ -158,6 +158,9 @@ function dispatch (action, ...args) {
   if (['videoMouseMoved', 'playbackJump'].indexOf(action) < 0) {
     console.log('dispatch: %s %o', action, args) /* log user interactions, but don't spam */
   }
+  if (action === 'openFiles') {
+    openFiles(args[0] /* files */)
+  }
   if (action === 'addTorrent') {
     addTorrent(args[0] /* torrent */)
   }
@@ -319,14 +322,16 @@ function updateClientProgress () {
   state.dock.progress = progress
 }
 
-function onFiles (files) {
+function openFiles (files) {
+  if (!Array.isArray(files)) files = [ files ]
+
   // .torrent file = start downloading the torrent
   files.filter(isTorrentFile).forEach(function (torrentFile) {
-    dispatch('addTorrent', torrentFile)
+    addTorrent(torrentFile)
   })
 
   // everything else = seed these files
-  dispatch('seed', files.filter(isNotTorrentFile))
+  seed(files.filter(isNotTorrentFile))
 }
 
 function onPaste (e) {
@@ -341,7 +346,8 @@ function onPaste (e) {
 }
 
 function isTorrentFile (file) {
-  var extname = path.extname(file.name).toLowerCase()
+  var name = typeof file === 'string' ? file : file.name
+  var extname = path.extname(name).toLowerCase()
   return extname === '.torrent'
 }