From 0fcd5594f726baf3ee3d8c4a74fcc437899178fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20Rodr=C3=ADguez?= Date: Mon, 30 Nov 2015 20:12:35 -0500 Subject: [PATCH] Fixed magnet downloading --- app.coffee | 31 +++++++++++++++++-------------- index.jade | 6 +++--- 2 files changed, 20 insertions(+), 17 deletions(-) diff --git a/app.coffee b/app.coffee index 5473528..63fee0b 100644 --- a/app.coffee +++ b/app.coffee @@ -6,7 +6,6 @@ app = angular.module 'bTorrent', [], ['$compileProvider','$locationProvider', ($ $locationProvider.html5Mode( enabled: true requireBase: false).hashPrefix '#' - return ] app.controller 'bTorrentCtrl', ['$scope','$http','$log','$location', ($scope, $http, $log, $location) -> @@ -17,8 +16,10 @@ app.controller 'bTorrentCtrl', ['$scope','$http','$log','$location', ($scope, $h if debug if torrent $log.debug '%c' + torrent.name + ' (' + torrent.infoHash + '): %c' + string, 'color: #33C3F0', 'color: #333' + return else $log.debug '%cClient: %c' + string, 'color: #33C3F0', 'color: #333' + return return updateAll = -> @@ -32,7 +33,7 @@ app.controller 'bTorrentCtrl', ['$scope','$http','$log','$location', ($scope, $h $scope.client.torrents.forEach (torrent) -> if !torrent.done done = false - return + return done $scope.client.downloading = -> @@ -40,7 +41,7 @@ app.controller 'bTorrentCtrl', ['$scope','$http','$log','$location', ($scope, $h $scope.client.torrents.forEach (torrent) -> if torrent.done downloading = false - return + return downloading $scope.uploadFile = -> @@ -54,24 +55,24 @@ app.controller 'bTorrentCtrl', ['$scope','$http','$log','$location', ($scope, $h return $scope.fromInput = -> - if $scope.torrentInput.length > 0 + if $scope.torrentInput != '' $scope.client.processing = true dbg 'Adding ' + $scope.torrentInput $scope.client.add $scope.torrentInput, $scope.onTorrent $scope.torrentInput = '' - return + return $scope.toggleTorrent = (torrent) -> if torrent.showFiles torrent.showFiles = false $scope.sTorrent = null + return else $scope.client.torrents.forEach (t) -> t.showFiles = false - return torrent.showFiles = true $scope.sTorrent = torrent - return + return $scope.destroyedTorrent = (err) -> if err @@ -81,6 +82,7 @@ app.controller 'bTorrentCtrl', ['$scope','$http','$log','$location', ($scope, $h $scope.onTorrent = (torrent, isSeed) -> $scope.client.processing = false + torrent.pSize = torrent.length torrent.showFiles = false torrent.fileName = torrent.name + '.torrent' torrent.oTorrentFileURL = torrent.torrentFileURL @@ -92,10 +94,11 @@ app.controller 'bTorrentCtrl', ['$scope','$http','$log','$location', ($scope, $h torrent.pProgress = (100 * torrent.progress).toFixed(1) if torrent.done torrent.tRemaining = 'Done' + return else remaining = moment.duration(torrent.timeRemaining / 1000, 'seconds').humanize() torrent.tRemaining = remaining[0].toUpperCase() + remaining.substr(1) - return + return torrent.files.forEach (file) -> file.pSize = file.length @@ -108,21 +111,21 @@ app.controller 'bTorrentCtrl', ['$scope','$http','$log','$location', ($scope, $h if !isSeed dbg 'Finished downloading file ' + file.name, torrent file.status = 'Ready' - $scope.$apply() return if !isSeed dbg 'Received file ' + file.name + ' metadata', torrent - return + return torrent.on 'download', (chunkSize) -> if !isSeed dbg 'Downloaded chunk', torrent - return + return torrent.on 'upload', (chunkSize) -> dbg 'Uploaded chunk', torrent return torrent.on 'done', -> if !isSeed dbg 'Done', torrent + return torrent.update() return torrent.on 'wire', (wire, addr) -> @@ -131,7 +134,6 @@ app.controller 'bTorrentCtrl', ['$scope','$http','$log','$location', ($scope, $h setInterval torrent.update, 500 torrent.update() return - $scope.onSeed = (torrent) -> $scope.onTorrent torrent, true return @@ -140,12 +142,13 @@ app.controller 'bTorrentCtrl', ['$scope','$http','$log','$location', ($scope, $h $scope.client.processing = true dbg 'Adding ' + $location.hash() client.add $location.hash(), $scope.onTorrent - return + return ] app.filter 'html', ['$sce', ($sce) -> (input) -> $sce.trustAsHtml input + return ] app.filter 'pbytes', -> @@ -168,7 +171,7 @@ app.filter 'pbytes', -> num = -num if num < 1 return (if neg then '-' else '') + num + ' B' - exponent = Math.min(Math.floor(Math.log(num) / Math.log(1000)), units.length - 1) + exponent = Math.min(Math.floor(Math.log(num) / Math.log(1000)), 8) num = (num / 1000 ** exponent).toFixed(1) * 1 unit = units[exponent] (if neg then '-' else '') + num + ' ' + unit diff --git a/index.jade b/index.jade index b76b35c..cc7d876 100644 --- a/index.jade +++ b/index.jade @@ -46,7 +46,7 @@ html(ng-app='bTorrent', lang='en') tbody(ng-hide='client.torrents.length') tr td.center(colspan='100') Add a torrent o seed a file! - tbody(ng-repeat='torrent in client.torrents', ng-if='torrent.name') + tbody(ng-repeat='torrent in client.torrents', ng-if='torrent.pSize') tr.torrentRow(ng-class='{selectedTorrent: torrent.showFiles}') td div @@ -54,7 +54,7 @@ html(ng-app='bTorrent', lang='en') i.fa.fa-check(ng-show='torrent.done') | {{torrent.name}} span.subInfo - | {{torrent.length | pbytes}} in + | {{torrent.pSize | pbytes}} in a(href='#', onclick='return false;', ng-click='toggleTorrent(torrent)') {{torrent.files.length}} files td(ng-hide='client.done()') | {{torrent.downloaded | pbytes}} @@ -89,7 +89,7 @@ html(ng-app='bTorrent', lang='en') li(ng-repeat='file in torrent.files') span(ng-hide='file.done') {{file.status}}: {{file.name}} a(href='{{file.url}}', download='{{file.name}}', target='_blank', ng-show='file.done') {{file.name}} - span.subInfo {{file.length | pbytes}} + span.subInfo {{file.pSize | pbytes}} tbody(ng-show='client.processing') tr td.center(colspan='100') Please wait a few seconds!