Auto populate 'Magnet Link' field with the address from clipboa… (#1681)
Auto populate 'Magnet Link' field with the address from clipboard
This commit is contained in:
@@ -1,8 +1,10 @@
|
||||
const React = require('react')
|
||||
const TextField = require('material-ui/TextField').default
|
||||
const { clipboard } = require('electron')
|
||||
|
||||
const ModalOKCancel = require('./modal-ok-cancel')
|
||||
const { dispatch, dispatcher } = require('../lib/dispatcher')
|
||||
const { isMagnetLink } = require('../lib/torrent-player')
|
||||
|
||||
module.exports = class OpenTorrentAddressModal extends React.Component {
|
||||
render () {
|
||||
@@ -30,6 +32,12 @@ module.exports = class OpenTorrentAddressModal extends React.Component {
|
||||
|
||||
componentDidMount () {
|
||||
this.torrentURL.input.focus()
|
||||
const clipboardContent = clipboard.readText()
|
||||
|
||||
if (isMagnetLink(clipboardContent)) {
|
||||
this.torrentURL.input.value = clipboardContent
|
||||
this.torrentURL.input.select()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -3,6 +3,7 @@ module.exports = {
|
||||
isVideo,
|
||||
isAudio,
|
||||
isTorrent,
|
||||
isMagnetLink,
|
||||
isPlayableTorrentSummary
|
||||
}
|
||||
|
||||
@@ -31,9 +32,15 @@ function isAudio (file) {
|
||||
// - a file object where obj.name is ends in .torrent
|
||||
// - a string that's a magnet link (magnet://...)
|
||||
function isTorrent (file) {
|
||||
const isTorrentFile = getFileExtension(file) === '.torrent'
|
||||
const isMagnet = typeof file === 'string' && /^(stream-)?magnet:/.test(file)
|
||||
return isTorrentFile || isMagnet
|
||||
return isTorrentFile(file) || isMagnetLink(file)
|
||||
}
|
||||
|
||||
function isTorrentFile (file) {
|
||||
return getFileExtension(file) === '.torrent'
|
||||
}
|
||||
|
||||
function isMagnetLink (link) {
|
||||
return typeof link === 'string' && /^(stream-)?magnet:/.test(link)
|
||||
}
|
||||
|
||||
function getFileExtension (file) {
|
||||
|
||||
Reference in New Issue
Block a user