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

Fixes for PR #299

Browse Source
This commit is contained in:
Feross Aboukhadijeh
2016-04-05 16:35:55 -07:00
parent db9e3e90c5
commit c83f345977
2 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
main/windows.js
View File

@@ -76,7 +76,7 @@ function createMainWindow () {
icon: config.APP_ICON + '.png', icon: config.APP_ICON + '.png',
minWidth: 375, minWidth: 375,
minHeight: 38 + (120 * 2), // header height + 2 torrents minHeight: 38 + (120 * 2), // header height + 2 torrents
show: true, // Hide window until DOM finishes loading show: false, // Hide window until DOM finishes loading
title: config.APP_WINDOW_TITLE, title: config.APP_WINDOW_TITLE,
titleBarStyle: 'hidden-inset', // Hide OS chrome, except traffic light buttons (OS X) titleBarStyle: 'hidden-inset', // Hide OS chrome, except traffic light buttons (OS X)
useContentSize: true, // Specify web page size without OS chrome useContentSize: true, // Specify web page size without OS chrome

23
renderer/index.js
View File

@@ -53,9 +53,10 @@ function init () {
// Push the first page into the location history // Push the first page into the location history
state.location.go({ url: 'home' }) state.location.go({ url: 'home' })
// Lazily load the WebTorrent, Chromecast, and Airplay modules initWebTorrent()
initWebtorrent()
window.setTimeout(lazyLoadCast, 750) // Lazily load the Chromecast/Airplay/DLNA modules
window.setTimeout(lazyLoadCast, 5000)
// The UI is built with virtual-dom, a minimalist library extracted from React // The UI is built with virtual-dom, a minimalist library extracted from React
// The concepts--one way data flow, a pure function that renders state to a // The concepts--one way data flow, a pure function that renders state to a
@@ -121,12 +122,12 @@ function lazyLoadCast () {
} }
// Talk to WebTorrent process, resume torrents, start monitoring torrent progress // Talk to WebTorrent process, resume torrents, start monitoring torrent progress
function initWebtorrent () { function initWebTorrent () {
// Restart everything we were torrenting last time the app ran // Restart everything we were torrenting last time the app ran
resumeTorrents() resumeTorrents()
// Calling update() updates the UI given the current state // Calling update() updates the UI given the current state
// Do this at least once a second to give every file in every torrentSummary // Do this at least once a second to give every file in every torrentSummary
// a progress bar and to keep the cursor in sync when playing a video // a progress bar and to keep the cursor in sync when playing a video
setInterval(update, 1000) setInterval(update, 1000)
} }
@@ -442,11 +443,11 @@ function onOpen (files) {
// .torrent file = start downloading the torrent // .torrent file = start downloading the torrent
files.filter(isTorrent).forEach(function (torrentFile) { files.filter(isTorrent).forEach(function (torrentFile) {
addTorrent(torrentFile.path) addTorrent(torrentFile)
}) })
// everything else = seed these files // everything else = seed these files
createTorrentFromFileObjects(files) createTorrentFromFileObjects(files.filter(isNotTorrent))
} }
function onPaste (e) { function onPaste (e) {
@@ -484,6 +485,10 @@ function getTorrentSummary (torrentKey) {
function addTorrent (torrentId) { function addTorrent (torrentId) {
var torrentKey = state.nextTorrentKey++ var torrentKey = state.nextTorrentKey++
var path = state.saved.downloadPath var path = state.saved.downloadPath
if (torrentId.path) {
// Use path string instead of W3C File object
torrentId = torrentId.path
}
ipcRenderer.send('wt-start-torrenting', torrentKey, torrentId, path) ipcRenderer.send('wt-start-torrenting', torrentKey, torrentId, path)
} }
@@ -536,9 +541,7 @@ function startTorrentingSummary (torrentSummary) {
// Creates a new torrent from a drag-dropped file or folder // Creates a new torrent from a drag-dropped file or folder
function createTorrentFromFileObjects (files) { function createTorrentFromFileObjects (files) {
var filePaths = (files var filePaths = files.map((x) => x.path)
.filter(isNotTorrent)
.map((x) => x.path))
// Single-file torrents are easy. Multi-file torrents require special handling // Single-file torrents are easy. Multi-file torrents require special handling
// make sure WebTorrent seeds all files in place, without copying to /tmp // make sure WebTorrent seeds all files in place, without copying to /tmp