November 2017 - tor-commits - lists.torproject.org

[atlas/master] Bump cache breaker
by irl＠torproject.org 26 Nov '17

26 Nov '17

commit 49ebff359fdf86280f5db4a6a4daa64f4060c8ae Author: Iain R. Learmonth <irl(a)fsfe.org> Date: Sun Nov 26 15:49:19 2017 +0000 Bump cache breaker --- index.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/index.html b/index.html index 6236f18..7928fb6 100644 --- a/index.html +++ b/index.html @@ -41,7 +41,7 @@ <script src="https://metrics.torproject.org/js/script.js"></script>  - <link rel="stylesheet" href="css/atlas.css?v8"> + <link rel="stylesheet" href="css/atlas.css?v9"> </head> @@ -168,7 +168,7 @@ $('.cookie-message').cookieBar({ closeButton: '.cbc' }); </script> <script> var require = { - urlArgs: "v8" + urlArgs: "v9" }; </script> <script data-main="js/main" src="js/libs/require/require.js"></script>

1 0

[atlas/master] Removes link to broken search page from full aggregation
by irl＠torproject.org 26 Nov '17

26 Nov '17

commit b891c7a470e530b433bc028d817385882feb39a5 Author: Iain R. Learmonth <irl(a)fsfe.org> Date: Sun Nov 26 15:47:23 2017 +0000 Removes link to broken search page from full aggregation --- templates/aggregate/search.html | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/templates/aggregate/search.html b/templates/aggregate/search.html index 5c3973c..d76ed16 100644 --- a/templates/aggregate/search.html +++ b/templates/aggregate/search.html @@ -84,7 +84,11 @@ <td data-order="<%= aggregate.middle_probability %>"><%= (aggregate.middle_probability * 100).toFixed(4) %>%</td> <td data-order="<%= aggregate.exit_probability %>"><%= (aggregate.exit_probability * 100).toFixed(4) %>%</td> <td> - <a href="#search/<% if ((typeof aggregate.as) == "string" && query.indexOf("as:") == -1) { %>as:<%= aggregate.as %> <% } if ((typeof aggregate.country) == "string" && query.indexOf("country:") == -1) { %>country:<%= aggregate.country %> <% } %><%= (query) ? query + " " : "" %>"><%= aggregate.relays %></a></td> + <% if ((typeof aggregate.as) == "string" || (typeof aggregate.country) == "string") { %> + <a href="#search/<% if ((typeof aggregate.as) == "string" && query.indexOf("as:") == -1) { %>as:<%= aggregate.as %> <% } if ((typeof aggregate.country) == "string" && query.indexOf("country:") == -1) { %>country:<%= aggregate.country %> <% } %><%= (query) ? query + " " : "" %>"><%= aggregate.relays %></a> + <% } else { %> + <%= aggregate.relays %> + <% } %> </td> <td> <% if (aggregate.guards > 0) { %>

1 0

[atlas/master] Fix handling of secondary search on Top Relays page
by irl＠torproject.org 26 Nov '17

26 Nov '17

commit f6f5a7b14bb3c6e51d1b970a4b6139c0f4d84e65 Author: Iain R. Learmonth <irl(a)fsfe.org> Date: Sun Nov 26 15:43:47 2017 +0000 Fix handling of secondary search on Top Relays page --- js/router.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/js/router.js b/js/router.js index c22bcf9..8052f82 100644 --- a/js/router.js +++ b/js/router.js @@ -166,9 +166,9 @@ define([ showTopRelays: function(){ $(".breadcrumb").html("<li><a href=\"https://metrics.torproject.org/\">Home</a></li><li><a href=\"https://metrics.torproject.org/services.html\">Services</a></li><li><a href=\"#\">Relay Search</a></li><li class=\"active\">Top Relays</li>"); - $("#secondary-search").show(); $("#secondary-search-query").val(""); + $("#secondary-search").hide(); $("#content").hide(); $(".progress").show(); @@ -181,6 +181,7 @@ define([ $("#search-title").text("Top Relays by Consensus Weight"); $(".progress").hide(); $("#content").show(); + $("#secondary-search").show(); }, error: function(erno){ @@ -188,6 +189,7 @@ define([ doSearchView.renderError(); $(".progress").hide(); $("#content").show(); + $("#secondary-search").show(); } }); },

1 0

[atlas/master] Fixes long-lived performance bug; max result set size to 2000
by irl＠torproject.org 26 Nov '17

26 Nov '17

commit b02efd6b0cb5263c37bd81f6f16b4cdeba5b11b7 Author: Iain R. Learmonth <irl(a)fsfe.org> Date: Sun Nov 26 02:21:40 2017 +0000 Fixes long-lived performance bug; max result set size to 2000 * The Backbone.js collection for the search results was being updated for every relay "looked up", when really this should only have happened when all relays had been processed. * Relays are now loaded in chunks, with a progress bar updating to show how many have been loaded. * When loading the secondary search box is removed from view as the updates are happening asynchronously and bad things would happen if the load was interrupted by a second search. --- css/atlas.css | 4 +-- index.html | 2 +- js/collections/results.js | 49 +++++++++++++++++++++--------------- js/helpers.js | 9 +++++++ js/router.js | 64 ++++++++++++++++++++++++++--------------------- templates/search/do.html | 4 +-- 6 files changed, 78 insertions(+), 54 deletions(-) diff --git a/css/atlas.css b/css/atlas.css index cdbec5e..41f799f 100644 --- a/css/atlas.css +++ b/css/atlas.css @@ -4,8 +4,8 @@ display: none; } -.progress .bar { - width: 50%; +.progress-bar { + width: 100%; } a.alleged { diff --git a/index.html b/index.html index 9ab3516..10aa909 100644 --- a/index.html +++ b/index.html @@ -151,7 +151,7 @@ </form> <h1>Relay Search</h1> <div class="progress progress-info progress-striped active"> - <div class="progress-bar"></div> + <div class="progress-bar">Rendering results...</div> </div> <div id="content"> <noscript> diff --git a/js/collections/results.js b/js/collections/results.js index da8a6a4..73ef819 100644 --- a/js/collections/results.js +++ b/js/collections/results.js @@ -41,29 +41,38 @@ define([ if (relays.length == 0) { error(0); return false; - } else if (relays.length > 500) { - relays = relays.slice(0, 500); + } else if (relays.length > 2000) { + relays = relays.slice(0, 2000); err = 4; } var lookedUpRelays = 0; - _.each(relays, function(relay) { - var lookedUp = function() { - lookedUpRelays++; - if (lookedUpRelays == relays.length) { - success(err, relaysPublished, bridgesPublished); - } - } - relay.lookup({ - success: function(){ - collection[options.add ? 'add' : 'reset'](relays, options); - lookedUp(); - }, - error: function() { - lookedUp(); - error(0); - } - }); - }); + var relayChunks = relays.chunk(600); + var chunkedLookup = function() { + _.each(relayChunks.pop(), function(relay) { + relay.lookup({ + success: function(){ + lookedUpRelays++; + }, + error: function() { + lookedUpRelays++; + error(0); + } + }); + }); + if (lookedUpRelays == relays.length) { + $('.progress-bar').width("100%"); + $('.progress-bar').html("Rendering results..."); + setTimeout(function() { + collection[options.add ? 'add' : 'reset'](relays, options); + success(err, relaysPublished, bridgesPublished); + }, 500); + } else { + $('.progress-bar').width((lookedUpRelays / relays.length * 100) + "%"); + $('.progress-bar').html(lookedUpRelays + " of " + relays.length + " loaded"); + setTimeout(chunkedLookup, 50); + } + } + chunkedLookup(); }).fail( function(jqXHR, textStatus, errorThrown) { if(jqXHR.statusText == "error") { diff --git a/js/helpers.js b/js/helpers.js index 214db67..457702b 100644 --- a/js/helpers.js +++ b/js/helpers.js @@ -278,3 +278,12 @@ window.onhashchange = function(){ $('.btn-navbar').click(); } } + +Object.defineProperty(Array.prototype, 'chunk', { + value: function(chunkSize) { + var R = []; + for (var i=0; i<this.length; i+=chunkSize) + R.push(this.slice(i,i+chunkSize)); + return R; + } +}); diff --git a/js/router.js b/js/router.js index 118c094..fed87ba 100644 --- a/js/router.js +++ b/js/router.js @@ -61,23 +61,24 @@ define([ // Empty aggregation query emptyAggregateSearch: function() { $(".breadcrumb").html("<li><a href=\"https://metrics.torproject.org/\">Home</a></li><li><a href=\"https://metrics.torproject.org/services.html\">Services</a></li><li><a href=\"#\">Relay Search</a></li><li class=\"active\">Error</li>"); - $("#secondary-search").show(); $("#secondary-search-query").val(""); + $("#secondary-search").hide(); $("#content").hide(); $(".progress").show(); - doSearchView.error = 5; - doSearchView.renderError(); - $(".progress").hide(); - $("#content").show(); + aggregateSearchView.error = 5; + aggregateSearchView.renderError(); + $(".progress").hide(); + $("#secondary-search").show(); + $("#content").show(); }, // Perform a countries aggregation aggregateSearch: function(aType, query){ $(".breadcrumb").html("<li><a href=\"https://metrics.torproject.org/\">Home</a></li><li><a href=\"https://metrics.torproject.org/services.html\">Services</a></li><li><a href=\"#\">Relay Search</a></li><li class=\"active\">Aggregated search" + ((query) ? " for " + query : "") + "</li>"); - $("#secondary-search").show(); $("#content").hide(); + $("#secondary-search").hide(); $(".progress").show(); aggregateSearchView.collection.aType = (aType) ? aType : "all"; @@ -100,12 +101,14 @@ define([ aggregateSearchView.render(query); $("#search-title").text("Aggregated results" + ((query) ? " for " + query : "")); $(".progress").hide(); + $("#secondary-search").show(); $("#content").show(); }, error: function(err){ aggregateSearchView.error = err; aggregateSearchView.renderError(); $(".progress").hide(); + $("#secondary-search").show(); $("#content").show(); } }); @@ -114,8 +117,8 @@ define([ // Perform a search on Atlas doSearch: function(query){ $(".breadcrumb").html("<li><a href=\"https://metrics.torproject.org/\">Home</a></li><li><a href=\"https://metrics.torproject.org/services.html\">Services</a></li><li><a href=\"#\">Relay Search</a></li><li class=\"active\">Search for " + query + "</li>"); - $("#secondary-search").show(); + $("#secondary-search").hide(); $("#content").hide(); $(".progress").show(); @@ -124,37 +127,40 @@ define([ doSearchView.renderError(); $(".progress").hide(); $("#content").show(); + $("#secondary-search").show(); } else { query = query.trim(); $("#secondary-search-query").val(query); doSearchView.collection.url = doSearchView.collection.baseurl + this.hashFingerprint(query); doSearchView.collection.lookup({ - success: function(err, relaysPublished, bridgesPublished){ - doSearchView.relays = doSearchView.collection.models; - // Redirect to the details page when there is exactly one - // search result. - if (doSearchView.relays.length == 1) { - document.location.replace("#details/" + - doSearchView.relays[0].fingerprint); - return; - } + success: function(err, relaysPublished, bridgesPublished){ + doSearchView.relays = doSearchView.collection.models; + // Redirect to the details page when there is exactly one + // search result. + if (doSearchView.relays.length == 1) { + document.location.replace("#details/" + + doSearchView.relays[0].fingerprint); + return; + } doSearchView.error = err; - doSearchView.relaysPublished = relaysPublished; - doSearchView.bridgesPublished = bridgesPublished; - doSearchView.render(query); - $("#search-title").text(query); - $(".progress").hide(); - $("#content").show(); - }, - - error: function(err){ + doSearchView.relaysPublished = relaysPublished; + doSearchView.bridgesPublished = bridgesPublished; + doSearchView.render(query); + $("#search-title").text(query); + $("#secondary-search").show(); + $(".progress").hide(); + $("#content").show(); + }, + + error: function(err){ doSearchView.error = err; doSearchView.renderError(); - $(".progress").hide(); - $("#content").show(); - } - }); + $(".progress").hide(); + $("#content").show(); + $("#secondary-search").show(); + } + }); } }, showTopRelays: function(){ diff --git a/templates/search/do.html b/templates/search/do.html index fb32fdb..3935182 100644 --- a/templates/search/do.html +++ b/templates/search/do.html @@ -39,8 +39,8 @@ <% if (error == 4) { %> <div class="alert alert-warning"> <strong>Too many matches!</strong><p>The current version of - Relay Search does not support a result set greater than 500 and only displays - the first 500 hits. This is due to some performance issues in rendering + Relay Search does not support a result set greater than 2000 and only displays + the first 2000 hits. This is due to some performance issues in rendering large results sets in JavaScript. Future versions will hopefully manage to overcome this issue.</p> <% if ( ! query.includes("running:true") ) { %><p>You may find it

1 0

[atlas/master] Makes numbers in Guard and Exit column clickable (Fixes: #24402)
by irl＠torproject.org 26 Nov '17

26 Nov '17

commit e50d28c45c8f6a3018dd6c1e802e511e34dcd28e Author: Iain R. Learmonth <irl(a)fsfe.org> Date: Sun Nov 26 14:36:29 2017 +0000 Makes numbers in Guard and Exit column clickable (Fixes: #24402) --- js/views/aggregate/search.js | 4 ++-- templates/aggregate/search.html | 20 +++++++++++++++++--- 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/js/views/aggregate/search.js b/js/views/aggregate/search.js index d189908..b3eeaeb 100644 --- a/js/views/aggregate/search.js +++ b/js/views/aggregate/search.js @@ -11,7 +11,7 @@ define([ 'bootstrap', 'datatablesbs' ], function($, _, Backbone, aggregatesCollection, aggregateSearchTemplate){ - var doCountriesView = Backbone.View.extend({ + var aggregateSearchView = Backbone.View.extend({ el: "#content", initialize: function() { this.collection = new aggregatesCollection; @@ -42,6 +42,6 @@ define([ this.$el.html(compiledTemplate({aggregates: null, error: this.error, countries: null})); } }); - return new doCountriesView; + return new aggregateSearchView; }); diff --git a/templates/aggregate/search.html b/templates/aggregate/search.html index 34db02c..5c3973c 100644 --- a/templates/aggregate/search.html +++ b/templates/aggregate/search.html @@ -83,9 +83,23 @@ <td data-order="<%= aggregate.guard_probability %>"><%= (aggregate.guard_probability * 100).toFixed(4) %>%</td> <td data-order="<%= aggregate.middle_probability %>"><%= (aggregate.middle_probability * 100).toFixed(4) %>%</td> <td data-order="<%= aggregate.exit_probability %>"><%= (aggregate.exit_probability * 100).toFixed(4) %>%</td> - <td><%= aggregate.relays %></td> - <td><%= aggregate.guards %></td> - <td><%= aggregate.exits %></td> + <td> + <a href="#search/<% if ((typeof aggregate.as) == "string" && query.indexOf("as:") == -1) { %>as:<%= aggregate.as %> <% } if ((typeof aggregate.country) == "string" && query.indexOf("country:") == -1) { %>country:<%= aggregate.country %> <% } %><%= (query) ? query + " " : "" %>"><%= aggregate.relays %></a></td> + </td> + <td> + <% if (aggregate.guards > 0) { %> + <a href="#search/<% if ((typeof aggregate.as) == "string" && query.indexOf("as:") == -1) { %>as:<%= aggregate.as %> <% } if ((typeof aggregate.country) == "string" && query.indexOf("country:") == -1) { %>country:<%= aggregate.country %> <% } %><%= (query) ? query + " " : "" %><% if (query.indexOf("flag:") == -1) { %>flag:guard<% } %>"><%= aggregate.guards %></a></td> + <% } else { %> + 0 + <% } %> + </td> + <td> + <% if (aggregate.exits > 0) { %> + <a href="#search/<% if ((typeof aggregate.as) == "string" && query.indexOf("as:") == -1) { %>as:<%= aggregate.as %> <% } if ((typeof aggregate.country) == "string" && query.indexOf("country:") == -1) { %>country:<%= aggregate.country %> <% } %><%= (query) ? query + " " : "" %><% if (query.indexOf("flag:") == -1) { %>flag:exit<% } %>"><%= aggregate.exits %></a></td> + <% } else { %> + 0 + <% } %> + </td> </tr> <% }); %> </tbody>

1 0

[atlas/master] Bump cache breaker
by irl＠torproject.org 26 Nov '17

26 Nov '17

commit 4e3142d68558e5c7c73e52a7a45ce06f0259a057 Author: Iain R. Learmonth <irl(a)fsfe.org> Date: Sun Nov 26 14:37:24 2017 +0000 Bump cache breaker --- index.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/index.html b/index.html index 10aa909..6236f18 100644 --- a/index.html +++ b/index.html @@ -41,7 +41,7 @@ <script src="https://metrics.torproject.org/js/script.js"></script>  - <link rel="stylesheet" href="css/atlas.css?v7"> + <link rel="stylesheet" href="css/atlas.css?v8"> </head> @@ -168,7 +168,7 @@ $('.cookie-message').cookieBar({ closeButton: '.cbc' }); </script> <script> var require = { - urlArgs: "v7" + urlArgs: "v8" }; </script> <script data-main="js/main" src="js/libs/require/require.js"></script>

1 0

[atlas/master] Allow direct linking to the aggregated search form
by irl＠torproject.org 26 Nov '17

26 Nov '17

commit c41cc88afafdda7e831656697cc5e358ca52a68c Author: Iain R. Learmonth <irl(a)fsfe.org> Date: Sun Nov 26 14:16:39 2017 +0000 Allow direct linking to the aggregated search form --- js/router.js | 14 +++++++++++++- templates/search/main.html | 6 +++--- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/js/router.js b/js/router.js index fed87ba..c22bcf9 100644 --- a/js/router.js +++ b/js/router.js @@ -18,7 +18,7 @@ define([ 'search/': 'doSearch', 'top10': 'showTopRelays', 'toprelays': 'showTopRelays', - 'aggregate(/:aType)(/:query)': 'aggregateSearch', + 'aggregate/:aType(/:query)': 'aggregateSearch', 'aggregate(/:aType)/': 'emptyAggregateSearch', // Default '*actions': 'defaultAction' @@ -200,6 +200,18 @@ define([ mainSearchView.render(); + if (actions == "aggregate") { + $('.search').hide(); + $('#aggregated-search-tab-content').fadeIn(); + $('.search-tabs').removeClass('active'); + $('#aggregated-search-tab').addClass('active'); + } else { + $('.search').hide(); + $('#main-search-tab-content').fadeIn(); + $('.search-tabs').removeClass('active'); + $('#main-search-tab').addClass('active'); + } + $(".progress").hide(); $("#content").show(); } diff --git a/templates/search/main.html b/templates/search/main.html index 14a4916..9c62548 100644 --- a/templates/search/main.html +++ b/templates/search/main.html @@ -1,6 +1,6 @@ <ul class="nav nav-tabs"> - <li id="main-search-tab" class="search-tabs active"><a onclick="$('.search').hide();$('#main-search-tab-content').fadeIn();$('.search-tabs').removeClass('active');$('#main-search-tab').addClass('active');">Simple Search</a></li> - <li id="aggregated-search-tab" class="search-tabs"><a onclick="$('.search').hide();$('#aggregated-search-tab-content').fadeIn();$('.search-tabs').removeClass('active');$('#aggregated-search-tab').addClass('active');">Aggregated Search</a></li> + <li id="main-search-tab" class="search-tabs active"><a href="#simple">Simple Search</a></li> + <li id="aggregated-search-tab" class="search-tabs"><a href="#aggregate">Aggregated Search</a></li> </ul> <div class="tab-content" id="search-tab-content"> @@ -27,7 +27,7 @@ do not include bridge data.</p> <form id="home-aggregate-search"> <div class="input-group"> <input class="search-query form-control" id="aggregated-query" placeholder="Query" type="text" autocorrect="off" autocapitalize="none"> - <span class="input-group-btn"><button id="do-aggregate" class="btn btn-primary" type="button">Aggregated Search</button><button class="btn btn-secondary" type="button" id="do-full-aggregation">Entire Network</button></span> + <span class="input-group-btn"><button id="do-aggregate" class="btn btn-primary" type="button">Aggregate</button><button class="btn btn-secondary" type="button" id="do-full-aggregation">Entire Network</button></span> </div> </form> </div>

1 0

[translation/whisperback_completed] Update translations for whisperback_completed
by translation＠torproject.org 26 Nov '17

26 Nov '17

commit d31980334193f254b55e5e7c5c988c85d4b8f02f Author: Translation commit bot <translation(a)torproject.org> Date: Sun Nov 26 13:15:34 2017 +0000 Update translations for whisperback_completed --- nl/nl.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nl/nl.po b/nl/nl.po index 3681160e7..aebbfba94 100644 --- a/nl/nl.po +++ b/nl/nl.po @@ -18,7 +18,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-03-20 12:09+0000\n" -"PO-Revision-Date: 2017-10-21 11:40+0000\n" +"PO-Revision-Date: 2017-11-26 13:03+0000\n" "Last-Translator: kwadronaut <kwadronaut(a)autistici.org>\n" "Language-Team: Dutch (http://www.transifex.com/otf/torproject/language/nl/)\n" "MIME-Version: 1.0\n"

1 0

[translation/whisperback] Update translations for whisperback
by translation＠torproject.org 26 Nov '17

26 Nov '17

commit a4fd613906e8f4306b601b3a78a9a6e83314e092 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Nov 26 13:15:25 2017 +0000 Update translations for whisperback --- nl/nl.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nl/nl.po b/nl/nl.po index 3681160e7..aebbfba94 100644 --- a/nl/nl.po +++ b/nl/nl.po @@ -18,7 +18,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-03-20 12:09+0000\n" -"PO-Revision-Date: 2017-10-21 11:40+0000\n" +"PO-Revision-Date: 2017-11-26 13:03+0000\n" "Last-Translator: kwadronaut <kwadronaut(a)autistici.org>\n" "Language-Team: Dutch (http://www.transifex.com/otf/torproject/language/nl/)\n" "MIME-Version: 1.0\n"

1 0

[atlas/master] Bump cache breaker
by irl＠torproject.org 25 Nov '17

25 Nov '17

commit 2dca3d512673ce6816486f4894fa9481efa09385 Author: Iain R. Learmonth <irl(a)fsfe.org> Date: Sun Nov 26 00:55:41 2017 +0000 Bump cache breaker --- index.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/index.html b/index.html index 408a94a..9ab3516 100644 --- a/index.html +++ b/index.html @@ -41,7 +41,7 @@ <script src="https://metrics.torproject.org/js/script.js"></script>  - <link rel="stylesheet" href="css/atlas.css?v6"> + <link rel="stylesheet" href="css/atlas.css?v7"> </head> @@ -168,7 +168,7 @@ $('.cookie-message').cookieBar({ closeButton: '.cbc' }); </script> <script> var require = { - urlArgs: "v6" + urlArgs: "v7" }; </script> <script data-main="js/main" src="js/libs/require/require.js"></script>

1 0